safer coding of router toplevel

[exim.git] / test / stderr / 0543

diff --git a/test/stderr/0543 b/test/stderr/0543
index 43cf03cdf3b4410a121076f8f85878039f059785..f43aa63fe19e9775c960927ed5ba14047c467777 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -1,12 +1,10 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN

-  Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-locking TESTSUITE/spool/db/retry.lockfile
+  Start queue run: pid=p1234

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@domain1
 unique = userx@domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@domain1
 unique = userx@domain1


@@ -22,7 +20,7 @@ set transport smtp
 queued for smtp transport: local_part = userx
 domain = domain1
   errors_to=NULL
 queued for smtp transport: local_part = userx
 domain = domain1
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by smarthost router
   envelope to: userx@domain1
   transport: smtp
 routed by smarthost router
   envelope to: userx@domain1
   transport: smtp


@@ -33,31 +31,18 @@ After routing:
     userx@domain1
   Failed addresses:
   Deferred addresses:
     userx@domain1
   Failed addresses:
   Deferred addresses:

-qrun-delivery forking for transport
-postfork: transport
-transport forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
-transport forked for fakens-search: npppp
-transport forking for fakens-search
-postfork: fakens-search
-transport forked for fakens-search: npppp
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-smtp.lockfile
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1
 unique = usery@domain1
 LOG: retry_defer MAIN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1
 unique = usery@domain1
 LOG: retry_defer MAIN

-  == usery@domain1 routing defer (-51): retry time not reached
+  == usery@domain1 routing defer (-52): retry time not reached

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:


@@ -65,8 +50,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     usery@domain1
   Failed addresses:
   Deferred addresses:
     usery@domain1

->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
 LOG: queue_run MAIN

-  End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>