Fix ChangeLog notice re manualroute option ordering

[users/jgh/exim.git] / test / stderr / 0386

diff --git a/test/stderr/0386 b/test/stderr/0386
index be777a7366ad958811c1bb6969bd89c11c4c3ee4..6fb8a55369621ae4d682fe9e2924a6ae4a25bdac 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -191,13 +191,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
-PDKIM >> raw hdr: {CR}{LF}
-PDKIM >> raw hdr: Message{SP}1{CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
-PDKIM >> raw hdr: rset{CR}{LF}
-PDKIM >> raw hdr: mail{SP}from:<x@y>{CR}{LF}
-PDKIM >> raw hdr: rcpt{SP}to:<2@b>{CR}{LF}
-PDKIM >> raw hdr: data{CR}{LF}
 >>Headers received:
 
 search_tidyup called
@@ -317,6 +310,7 @@ lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0
+cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
@@ -379,9 +373,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
-PDKIM >> raw hdr: {CR}{LF}
-PDKIM >> raw hdr: Message{SP}2{CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
 >>Headers received:
 
 search_tidyup called
@@ -399,7 +390,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
 >>
-PDKIM >> raw hdr: quit{CR}{LF}
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
@@ -501,6 +491,7 @@ lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0
+cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd