Testsuite: munge for error message sizes in retry records

[exim.git] / test / stdout / 4004

diff --git a/test/stdout/4004 b/test/stdout/4004
index afff4e4dfa56b4564388d7db62dc0acbd7b90c31..16898c2e1d16aac5d4cbc30ddc2bd45901ac537e 100644 (file)
--- a/test/stdout/4004
+++ b/test/stdout/4004
@@ -1,13 +1,14 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********


@@ -15,7 +16,7 @@ Listening on port 11333 ...
 Connection request from [127.0.0.1]
 <CHECK RSPAMC/1.3
 <Content-length: ddd
 Connection request from [127.0.0.1]
 <CHECK RSPAMC/1.3
 <Content-length: ddd

-<Queue-Id: 10HmaX-0005vi-00
+<Queue-Id: 10HmaX-000000005vi-0000

 <From: <CALLER@myhost.test.ex>
 <Recipient-Number: 1
 <Rcpt: <userx@test.ex>
 <From: <CALLER@myhost.test.ex>
 <Recipient-Number: 1
 <Rcpt: <userx@test.ex>


@@ -28,11 +29,12 @@ Connection request from [127.0.0.1]
 <Received: from CALLER (helo=test.ex)
 <      by myhost.test.ex with local-esmtp (Exim x.yz)
 <      (envelope-from <CALLER@myhost.test.ex>)
 <Received: from CALLER (helo=test.ex)
 <      by myhost.test.ex with local-esmtp (Exim x.yz)
 <      (envelope-from <CALLER@myhost.test.ex>)

-<      id 10HmaX-0005vi-00
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      id 10HmaX-000000005vi-0000
+<      for userx@test.ex;
+<      Tue, 2 Mar 1999 09:44:33 +0000

 <From: MAILER_DAEMON <>
 <Content-type: text/plain
 <From: MAILER_DAEMON <>
 <Content-type: text/plain

-<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+<Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 <Sender: CALLER_NAME <CALLER@myhost.test.ex>
 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <
 <Sender: CALLER_NAME <CALLER@myhost.test.ex>
 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <