Testsuite: support "anything but" returncode script lines

[exim.git] / test / mail / 0309.CALLER

diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index f5ae66a5fd028cfcd3e92db2c4d34256dfb00d4a..fc334587a5288da2f7bc8bd6486ac5d18376a6f6 100644 (file)
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -1,16 +1,23 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)

-       id 10HmaY-0005vi-00
-       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+       id 10HmaY-000000005vi-0000
+       for CALLER@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 X-Failed-Recipients: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex

+References: <E10HmaX-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
 Subject: Mail delivery failed: returning message to sender

+Message-Id: <E10HmaY-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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -21,15 +28,34 @@ recipients. This is a permanent error. The following address(es) failed:
   55@myhost.test.ex
   50@myhost.test.ex
 
   55@myhost.test.ex
   50@myhost.test.ex
 

------- 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;50@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;55@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;1k@myhost.test.ex
+Status: 5.0.0
+
+--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)
        (envelope-from <CALLER@myhost.test.ex>)
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message. This is a test message.
 This is a test message. This is a test message.
 
 This is a test message. This is a test message.
 This is a test message. This is a test message.


@@ -53,3 +79,5 @@ This is a test message. This is a test message.
 This is a test message. This is a test message.
 This is a test message. This is a test message.
 
 This is a test message. This is a test message.
 This is a test message. This is a test message.
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+