Testsuite: munge GnuTLS and OpenSSL ciphersuite strings to be more similar

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

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index e7882aa43a2f100417c0633cca6d826e13d81055..495410dae58dfa02013b0ef69e1e7f27e0d7ec08 100644 (file)
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -27,10 +27,15 @@ X-Failed-Recipients: reply2@test.ex
 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

+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


@@ -38,7 +43,17 @@ recipients. This is a permanent error. The following address(es) failed:
 
   reply2@test.ex
 
 
   reply2@test.ex
 

------- 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;reply2@test.ex
+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)


@@ -51,3 +66,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--
+