Fix 2-phase, in-order queue run delivery order

[exim.git] / test / log / 0137

diff --git a/test/log/0137 b/test/log/0137
index 30ee4cdd5e1ec41e9b7f0203d7dc5e63813b5a74..81f0892853d71d33f3ae51d65c238e53757c466d 100644 (file)
--- a/test/log/0137
+++ b/test/log/0137
@@ -1,21 +1,21 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="First"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="Second"
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=smart T=local_delivery defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (lock file)
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="Third"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@test.ex R=smart T=local_delivery_fcntl defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock)
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery_fcntl
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="Fourth"
-1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@test.ex R=smart T=local_delivery_fcntl_blocking defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock)
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery_fcntl_blocking
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= t1@foo U=CALLER P=local S=sss T="First"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx <userx@test.ex> R=smart T=local_delivery
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= t1@foo U=CALLER P=local S=sss T="Second"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 == userx@test.ex R=smart T=local_delivery defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (lock file)
+1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => userx <userx@test.ex> R=smart T=local_delivery
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1234 -qf
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= t2@foo U=CALLER P=local S=sss T="Third"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == userx@test.ex R=smart T=local_delivery_fcntl defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock)
+1999-03-02 09:44:33 Start queue run: pid=p1235 -qf
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => userx <userx@test.ex> R=smart T=local_delivery_fcntl
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1235 -qf
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= t3@foo U=CALLER P=local S=sss T="Fourth"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 == userx@test.ex R=smart T=local_delivery_fcntl_blocking defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock)
+1999-03-02 09:44:33 Start queue run: pid=p1236 -qf
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => userx <userx@test.ex> R=smart T=local_delivery_fcntl_blocking
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1236 -qf