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

[exim.git] / test / log / 0286

diff --git a/test/log/0286 b/test/log/0286
index 5a83363262cde452a6080de13471e86c7359b1dc..f49eab58b473ef1277869696a2fa898d5274a816 100644 (file)
--- a/test/log/0286
+++ b/test/log/0286
@@ -1,32 +1,32 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss

 1999-03-02 09:44:33 Start queue run: pid=p1234
 1999-03-02 09:44:33 Start queue run: pid=p1234

-1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 2"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 3"
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 2"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 3"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed

 1999-03-02 09:44:33 End queue run: pid=p1234
 1999-03-02 09:44:33 Start queue run: pid=p1235
 1999-03-02 09:44:33 End queue run: pid=p1234
 1999-03-02 09:44:33 Start queue run: pid=p1235

-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => :blackhole: <CALLER@test.ex> R=bounces
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed

 1999-03-02 09:44:33 End queue run: pid=p1235
 1999-03-02 09:44:33 End queue run: pid=p1235

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss

 1999-03-02 09:44:33 Start queue run: pid=p1236
 1999-03-02 09:44:33 Start queue run: pid=p1236

-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 ** a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 ** b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 -> d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 ** e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 ** f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => g@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed

 1999-03-02 09:44:33 End queue run: pid=p1236
 1999-03-02 09:44:33 Start queue run: pid=p1237
 1999-03-02 09:44:33 End queue run: pid=p1236
 1999-03-02 09:44:33 Start queue run: pid=p1237

-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => :blackhole: <CALLER@test.ex> R=bounces
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed

 1999-03-02 09:44:33 End queue run: pid=p1237
 1999-03-02 09:44:33 End queue run: pid=p1237