Unbreak build with dmarc, pt. 2

[exim.git] / test / stderr / 1160

diff --git a/test/stderr/1160 b/test/stderr/1160
index 6a2b72e90fa14bfadea611e2fcb73eb404b9262a..cdbad361451a2fb4416e6a99e76198f5a240d11c 100644 (file)
--- a/test/stderr/1160
+++ b/test/stderr/1160
@@ -9,15 +9,16 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<CALLER@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<CALLER@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
-  SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP>> QUIT
+  SMTP<< 250 OK id=10HmaZ-0005vi-00
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
@@ -32,17 +33,18 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<CALLER@test.ex>
-  SMTP>> RCPT TO:<xyz@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<CALLER@test.ex>
+  SMTP|> RCPT TO:<xyz@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
-  SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP>> QUIT
+  SMTP<< 250 OK id=10HmbA-0005vi-00
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
@@ -56,15 +58,16 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ...  connected
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<abcd@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<abcd@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
-  SMTP<< 250 OK id=10HmbB-0005vi-00
   SMTP>> QUIT
+  SMTP<< 250 OK id=10HmbB-0005vi-00
+  SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 LOG: MAIN
   => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"