Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / stderr / 0143

diff --git a/test/stderr/0143 b/test/stderr/0143
index e9db55adc8c3022f43bdf97ade6d3c45781589f3..c1b6deb26b566fc8fa0272b986fb786258d0cf2b 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -8,6 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------
 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------


@@ -19,7 +20,7 @@ hostlist:
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)

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

   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes


@@ -33,9 +34,11 @@ cmd buf flush ddd bytes
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes

+sync_responses expect rcpt

   SMTP<< 250 Recipient OK
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 Recipient OK
   SMTP>> DATA
 cmd buf flush ddd bytes

+sync_responses expect data

   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat


@@ -53,5 +56,5 @@ LOG: MAIN
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>