Testsuite: support "anything but" returncode script lines

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

diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index 0d795f63652998fc5a39b21494dbe84d34f728fd..7a7b9a1907b80334fbf38c49068693784b221085 100644 (file)
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -2,17 +2,19 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
-       id 10HmaX-0005vi-00
-       for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00.a-b-c-@some.domain>
+       id 10HmaX-000000005vi-0000
+       for CALLER@the.local.host.name;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 11
+X-message-linecount: 13
 X-received-count: 1
 
 This is a test message.
@@ -23,18 +25,20 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
-       id 10HmaY-0005vi-00
-       for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
+       id 10HmaY-000000005vi-0000
+       for CALLER@the.local.host.name;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second
+Message-Id: <E10HmaY-000000005vi-0000.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 10
+X-message-linecount: 12
 X-received-count: 1
 
 This is a second test message.
@@ -43,19 +47,21 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
-       id 10HmaZ-0005vi-00
-       for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
+       id 10HmaZ-000000005vi-0000
+       for CALLER@the.local.host.name;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third
 Reply-to: some@body
+Message-Id: <E10HmaZ-000000005vi-0000.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 11
+X-message-linecount: 13
 X-received-count: 1
 
 This is a third test message.