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

[exim.git] / test / mail / 0307.anyone

diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index 2c8eb725123f24f865b4e1f54e5fa140c0919edf..67e5f59f5bba4efda073b7ee3d40e3c3b6fa3959 100644 (file)
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -1,15 +1,22 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbA-0005vi-00
-       for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for anyone@anywhere;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmaZ-000000005vi-0000@myhost.test.ex>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 This message was created automatically by mail delivery software.
 
 A message that you sent could not be delivered to one or more of its
@@ -18,30 +25,50 @@ recipients. This is a permanent error. The following address(es) failed:
   list1@lists.test.ex
     list1@lists.test.ex is a closed mailing list
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;list1@lists.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
-       id 10HmaZ-0005vi-00
-       for list1@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for list1@lists.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
-       for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbC-000000005vi-0000
+       for anyone@anywhere;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmbB-000000005vi-0000@myhost.test.ex>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 This message was created automatically by mail delivery software.
 
 A message that you sent could not be delivered to one or more of its
@@ -50,15 +77,28 @@ recipients. This is a permanent error. The following address(es) failed:
   nonlist@lists.test.ex
     nonlist@lists.test.ex is a closed mailing list
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;nonlist@lists.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
-       id 10HmbB-0005vi-00
-       for nonlist@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+       id 10HmbB-000000005vi-0000
+       for nonlist@lists.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+