Transactions in retry hintsdb

[exim.git] / test / stderr / 0333

diff --git a/test/stderr/0333 b/test/stderr/0333
index d886f53ee1e87fd68fb5fc3e7308023b3d535c62..8a7d6dd4200c07d35b48dbb493e7dbccaa495e93 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -3,7 +3,6 @@ Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

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


@@ -31,9 +30,8 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
     ok@no.delay
   Failed addresses:
   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'
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'

+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN


@@ -45,7 +43,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns


@@ -79,9 +76,8 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
   Failed addresses:
   Deferred addresses:
     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'
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'

+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

->>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>