Hintsbd: fix locking

[exim.git] / test / stderr / 0332

diff --git a/test/stderr/0332 b/test/stderr/0332
index 70e7dc6e6414b56c585de0756f8020a690783645..0ffdc81c149f0810660035dc8ea131b1f861dda0 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -1,8 +1,10 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 LOG: queue_run MAIN
 LOG: queue_run MAIN

-  Start queue run: pid=pppp
+  Start queue run: pid=p1234

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay


@@ -20,7 +22,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL

 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -33,20 +35,24 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile

+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'

 LOG: MAIN
 LOG: MAIN

-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

+>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 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

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN

-  == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer
+  == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay


@@ -63,7 +69,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL

 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -77,15 +83,16 @@ After routing:
     delay@test.again.dns
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
     delay@test.again.dns
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile

+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'

 LOG: MAIN
 LOG: MAIN

-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]*
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
+>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN

-  == delay@test.again.dns routing defer (-51): retry time not reached
+  == delay@test.again.dns routing defer (-52): retry time not reached

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


@@ -93,6 +100,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns

+>>>>>>>>>>>>>>>> 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 terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>