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

[exim.git] / test / mail / 0253.lmn

diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index eeac8dc204be4f8917eaf6f1e12d11873ac872a5..388dccf180df41185751e4d94a19b3fd0f12fb2c 100644 (file)
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -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 lmn@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for lmn@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: lmn@myhost.test.ex
+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
-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 sent by
@@ -20,18 +27,34 @@ could not be delivered to one or more of its recipients. The following
 address(es) failed:
 
   fail@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<fail@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+    550 Recipient not OK
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
 
------- This is a copy of the message, including all the headers. ------
+Action: failed
+Final-Recipient: rfc822;fail@myhost.test.ex
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 550 Recipient not OK
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <pqr@x.y.z>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: pqr@x.y.z
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+