Testsuite: fix 0173 and related

[users/jgh/exim.git] / test / mail / 0374.CALLER

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 36e4ef01473f14a9891226a8564b362e90a5c9de..e92bef1f151f708ab7cb92e77c8e25aaf33cd091 100644 (file)
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -9,22 +9,44 @@ X-Failed-Recipients: d3@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@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: <E10HmaY-0005vi-00@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
 recipients. This is a permanent error. The following address(es) failed:
 
   d3@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
   b1@myhost.test.ex
     local delivery failed
 
------- 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;b1@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;d3@myhost.test.ex
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 550 hard error
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -35,3 +57,5 @@ From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+