Testsuite: tidying

[users/heiko/exim.git] / test / mail / 0032.CALLER

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 2c3c866be1c2846be274b630a2d6df4964ef424b..3551d575316a7b78c27b63ad275f858f56be7439 100644 (file)
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -5,13 +5,19 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
 To: CALLER@myhost.ex
+References: <E10HmaX-0005vi-00@myhost.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: <E10HmaY-0005vi-00@myhost.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.
 
@@ -21,16 +27,28 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@mxt1.test.ex
     lowest numbered MX record points to local host
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@mxt1.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.ex>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@mxt1.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+