Two-phase queue run perf: parallel processes for phase one

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

diff --git a/test/stderr/0276 b/test/stderr/0276
index c721ff784e06e95104d7b82dd2166a07d36500ef..992e67b41e912aed74c9a76d09d8cbf5f264a266 100644 (file)
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00

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

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


@@ -14,14 +14,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP<< 500 NO
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP<< 500 NO
   SMTP>> QUIT

+  SMTP(close)>>

 LOG: MAIN
 LOG: MAIN

-  ** userx@test.ex R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+  ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO

 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmaY-0005vi-00

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused

 LOG: MAIN
 LOG: MAIN

-  127.0.0.1 [127.0.0.1] Connection refused
+  H=127.0.0.1 [127.0.0.1] Connection refused

 LOG: MAIN
   == CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
 LOG: MAIN
   == CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN


@@ -35,26 +36,27 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00

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

   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
          250 OK
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP<< 250 OK
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
          250 OK
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP<< 250 OK

-  SMTP>> RCPT TO:<userx@test.ex>
+  SMTP>> RCPT TO:<usery@test.ex>

   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 500 NO
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 500 NO
   SMTP>> QUIT

+  SMTP(close)>>

 LOG: MAIN
 LOG: MAIN

-  ** userx@test.ex R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+  ** usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO

 LOG: MAIN
   <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmbA-0005vi-00
 LOG: MAIN
   <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 delivering 10HmbA-0005vi-00

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused

 LOG: MAIN
 LOG: MAIN

-  127.0.0.1 [127.0.0.1] Connection refused
+  H=127.0.0.1 [127.0.0.1] Connection refused

 LOG: MAIN
   == CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
 LOG: MAIN
   == CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN