Merge from master into 4.next

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

diff --git a/test/stderr/0217 b/test/stderr/0217
index 3ae4b8fe52589695b5741edf07b6ba5a9ea1f1b4..9e31fb1d0866234ff2af5cdc58663435a2e99b99 100644 (file)
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbL-0005vi-00
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbL-0005vi-00

-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected

   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -413,6 +413,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
   SMTP<< 550 NO
   SMTP<< 403 Sorry temp data error
   SMTP>> QUIT
   SMTP<< 550 NO
   SMTP<< 403 Sorry temp data error
   SMTP>> QUIT

+  SMTP(close)>>

 LOG: MAIN
   == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
 LOG: MAIN
 LOG: MAIN
   == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
 LOG: MAIN


@@ -827,7 +828,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbP-0005vi-00
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmbP-0005vi-00

-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected

   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -847,6 +848,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
   SMTP>> QUIT
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
   SMTP>> QUIT

+  SMTP(close)>>

 LOG: MAIN
   => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
 LOG: MAIN
   => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN