Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stdout / 0554

diff --git a/test/stdout/0554 b/test/stdout/0554
index 8c0cfea8abd33098537c89380b7ee2164c4ef646..f7a4b483812dfded10cc38331efcf7feadb5c3b5 100644 (file)
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -1,6 +1,6 @@
 +++++++++++++++++++++++++++
 +++++++++++++++++++++++++++

-  R:x@y:<CALLER@myhost.test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+  R:x@y:<CALLER@myhost.test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 2

 +++++++++++++++++++++++++++
 
 ******** SERVER ********
 +++++++++++++++++++++++++++
 
 ******** SERVER ********


@@ -29,9 +29,10 @@ DATA
 354 Go Ahead
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 354 Go Ahead
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

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