Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stdout / 0490

diff --git a/test/stdout/0490 b/test/stdout/0490
index fb456ca526411ac616bc3049f5d1a3d27accd483..603dfe6ea74290196778438ffbb0d054f2e6db1a 100644 (file)
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -6,14 +7,15 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

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

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

-10HmaY-0005vi-00-H
+10HmaY-000000005vi-0000-H

 CALLER UID GID
 <CALLER@myhost.test.ex>
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu
 CALLER UID GID
 <CALLER@myhost.test.ex>
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu

+--helo_name test

 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 2
 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 2


@@ -27,11 +29,12 @@ XX
 1
 bb@test.ex
 
 1
 bb@test.ex
 

-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000

        for bb@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for bb@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>

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