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

[exim.git] / test / mail / 0230.x

diff --git a/test/mail/0230.x b/test/mail/0230.x
index 6027b25e11d04af458e5e8e2cd8812c4cc2539b2..e1ae045550ed7e66b798a9bcda82d103be2f08a1 100644 (file)
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -1,18 +1,20 @@
 From x@y.x Tue Mar 02 09:44:33 1999
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4] (port=1113)
+Received: from [ip4.ip4.ip4.ip4] (port=1113 helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)

-       id 10HmaY-0005vi-00
-       for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for x@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Port: 1113
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
 Port: 1113
 
 
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1] (port=1114)
+Received: from [127.0.0.1] (port=1114 helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)

-       id 10HmaZ-0005vi-00
-       for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-000000005vi-0000
+       for x@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Port: 1114
 
 
 Port: 1114
 
 


@@ -20,17 +22,19 @@ From x@y.x Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4] (port=1115 helo=rhubarb)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
 Received: from [ip4.ip4.ip4.ip4] (port=1115 helo=rhubarb)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)

-       id 10HmbA-0005vi-00
-       for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for x@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Port: 1115
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
 Port: 1115
 
 
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [V4NET.9.8.7] (port=1111 ident=root)
+Received: from [V4NET.9.8.7] (port=1111 helo=test ident=root)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)

-       id 10HmaX-0005vi-00
-       for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for x@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Port: 1111
 
 -oMa message
 Port: 1111
 
 -oMa message