Testsuite: munge for error message sizes in retry records

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

diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index e9a50054edc5c1b611cdbb12ef3d8c03eab103c3..f5c894b88d277122b2769b967512c42d46e9d874 100644 (file)
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -2,22 +2,25 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@the.local.host.name>
 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 <CALLER@the.local.host.name>)
        (envelope-from <CALLER@the.local.host.name>)

-       id 10HmaX-0005vi-00
-       for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for CALLER@the.local.host.name;
+       Tue, 2 Mar 1999 09:44:33 +0000

 x-test-header-good1: 1234567890qwertzuiopasdfghjklyxcvbnm,.-QWERTZUIOP+*ASDFGHJKL#'YXCVBNM,.-;:_
 x-test-header-good2: ßüöä€ÜÖÄ´ऑकजᐁᑌᑕ𫝆𫟘
 x-test-header-too-short: Ã.Ã.Ã.ä-â\82.-Ã\9c.Ã..Ã.-Â.-à..-à¤.-à¤.-á\90.-á\91.-á..-ð«\9d..ð«\9f.
 x-test-header-too-long: ø\88\88\88\88-ä-ø\88\88\88\88--Ã\96-Ã\84-´-à¤\91-à¤\95-à¤\9c-á\90\81-á\91\8c-á\91\95-ø\80\80\80\80ð«\9f\86
 x-test-header-too-big: ����-----󀀀
 x-test-header-good1: 1234567890qwertzuiopasdfghjklyxcvbnm,.-QWERTZUIOP+*ASDFGHJKL#'YXCVBNM,.-;:_
 x-test-header-good2: ßüöä€ÜÖÄ´ऑकजᐁᑌᑕ𫝆𫟘
 x-test-header-too-short: Ã.Ã.Ã.ä-â\82.-Ã\9c.Ã..Ã.-Â.-à..-à¤.-à¤.-á\90.-á\91.-á..-ð«\9d..ð«\9f.
 x-test-header-too-long: ø\88\88\88\88-ä-ø\88\88\88\88--Ã\96-Ã\84-´-à¤\91-à¤\95-à¤\9c-á\90\81-á\91\8c-á\91\95-ø\80\80\80\80ð«\9f\86
 x-test-header-too-big: ����-----󀀀

+x-test-header-truncated: ã

 Subject: This is a test message.
 Subject: This is a test message.

-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>

 From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
 From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3

-X-message-linecount: 16
+X-message-linecount: 19

 X-received-count: 1
 
 This is a test message.
 X-received-count: 1
 
 This is a test message.


@@ -28,17 +31,19 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@the.local.host.name>
 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 <CALLER@the.local.host.name>)
        (envelope-from <CALLER@the.local.host.name>)

-       id 10HmaY-0005vi-00
-       for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for CALLER@the.local.host.name;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: second
 Subject: second

-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>

 From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
 From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

-X-message-linecount: 9
+X-message-linecount: 11

 X-received-count: 1
 
 This is a second test message.
 X-received-count: 1
 
 This is a second test message.