git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix 2-phase, in-order queue run delivery order
[exim.git] / test / mail / 0037.userz
diff --git a/test/mail/0037.userz b/test/mail/0037.userz
index ec84231886cb4aa4e079f4542a226ecfaffdb83d..3c95114b67c7fd95ea20cb00b7a7ea3640ea19fd 100644 (file)
--- a/test/mail/0037.userz
+++ b/test/mail/0037.userz
@@ -4,12 +4,13 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test 1
 Subject: Test 1
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
 X-added: qualify_domain is test.ex
 
 
@@ -19,11 +20,12 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+       id 10HmaY-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should fail this
 Subject: should fail this
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Fail this.
 X-added: qualify_domain is test.ex
 
 Fail this.
@@ -34,12 +36,13 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbA-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+       id 10HmbA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Subject: should freeze this
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this.
 X-added: qualify_domain is test.ex
 
 Freeze this.
@@ -50,12 +53,13 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbC-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+       id 10HmbC-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Subject: reply to this
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Reply to this.
 X-added: qualify_domain is test.ex
 
 Reply to this.
@@ -66,12 +70,13 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbS-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
+       id 10HmbU-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Subject: should freeze this
+Message-Id: <E10HmbU-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this (second message).
 X-added: qualify_domain is test.ex
 
 Freeze this (second message).
@@ -82,11 +87,12 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbU-0005vi-00
-       for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
+       id 10HmbW-000000005vi-0000
+       for readfile@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbW-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
@@ -97,12 +103,13 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbY-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbY-0005vi-00@the.local.host.name>
+       id 10HmcA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should defer this
 Subject: should defer this
+Message-Id: <E10HmcA-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Defer this.
 X-added: qualify_domain is test.ex
 
 Defer this.
Master Exim source repository