ARC: reset headers before signing for secondary MX. Bug 2886

[exim.git] / test / stderr / 0476

diff --git a/test/stderr/0476 b/test/stderr/0476
index 391c13b594fe586824774c3cd8fe6d2d11888904..ea51b3f53796f0a20bce79c8a9b9dd7deac61882 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -27,8 +27,8 @@ cmd buf flush ddd bytes
          250 OK
 using PIPELINING
 not using DSN
-  SMTP>> MAIL FROM:<CALLER@the.local.host.name>
-  SMTP>> RCPT TO:<userx@test.ex>
+  SMTP|> MAIL FROM:<CALLER@the.local.host.name>
+  SMTP|> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
 sync_responses expect mail
@@ -48,6 +48,7 @@ cmd buf flush ddd bytes
   SMTP(closed)<<
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:RSET'
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)
@@ -57,13 +58,13 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
 LOG: MAIN
   ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 NO
 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 set_process_info: pppp accepting a local non-SMTP message from <>
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
@@ -91,7 +92,7 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.
 added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
-added to list for 127.0.0.1
+added 10HmaZ-0005vi-00 to queue for 127.0.0.1
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess)
 set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
@@ -120,7 +121,7 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = unusable
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
-added to list for 127.0.0.1
+added 10HmaY-0005vi-00 to queue for 127.0.0.1
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess)
 set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)