Testsuite: better sorting for exim_dumpdb output

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

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 95051c4d9db850842e8c60bfff90ba326cb60dcc..3551d575316a7b78c27b63ad275f858f56be7439 100644 (file)
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -9,10 +9,16 @@ X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
 To: CALLER@myhost.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
 
 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.
 
 A message that you sent could not be delivered to one or more of its
 This message was created automatically by mail delivery software.
 
 A message that you sent could not be delivered to one or more of its


@@ -21,7 +27,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@mxt1.test.ex
     lowest numbered MX record points to local host
 
   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)
 
 Return-path: <CALLER@myhost.ex>
 Received: from CALLER by myhost.ex with local (Exim x.yz)


@@ -34,3 +50,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
 
 This is a test message.
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+