Testsuite: fix testcase for SPF empty-mailfrom-use-helo. Bug 467

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

diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 4ede20de79480e0fcad5331feff7aa5359cb46c0..13bf30b339ec3d6406af2f9d5fa81f9e06e80667 100644 (file)
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -6,10 +6,16 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex

+References: <E10HmaX-0005vi-00@the.local.host.name>
+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@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 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


@@ -62,7 +68,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 ------------------
 
 
 ------------------
 

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;system-filter
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)


@@ -74,6 +90,8 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+

 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00


@@ -82,10 +100,16 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex

+References: <E10HmaZ-0005vi-00@the.local.host.name>
+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: <E10HmbA-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 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


@@ -139,7 +163,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 ------------------
 
 
 ------------------
 

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;system-filter
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)


@@ -150,3 +184,5 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+