Merge branch '4.next'

[exim.git] / test / stdout / 0209

diff --git a/test/stdout/0209 b/test/stdout/0209
index cdb29fe7dd66241ee84989719222a3f971dee8a7..99d15bd450b82511bd60ad93fd50947a333c2274 100644 (file)
--- a/test/stdout/0209
+++ b/test/stdout/0209
@@ -1,5 +1,5 @@
-Message 10HmaX-0005vi-00 has been removed
-Message 10HmaY-0005vi-00 has been removed
+Message 10HmaX-000000005vi-0000 has been removed
+Message 10HmaY-000000005vi-0000 has been removed

 
 ******** SERVER ********
 Listening on port 1224 ... 
 
 ******** SERVER ********
 Listening on port 1224 ... 


@@ -11,7 +11,7 @@ EHLO the.local.host.name
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<userz@domain1>
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<userz@domain1>

-450 Temporary error
+450 Temporary error 1

 QUIT
 250 OK
 End of script
 QUIT
 250 OK
 End of script


@@ -24,15 +24,16 @@ EHLO the.local.host.name
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<userx@domain1>
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<userx@domain1>

-450 Temporary error
+450 Temporary error 2

 RCPT TO:<usery@domain1>
 250 OK
 DATA
 354 Go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 RCPT TO:<usery@domain1>
 250 OK
 DATA
 354 Go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+       id 10HmaZ-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>

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


@@ -41,26 +42,8 @@ Test message 1
 250 OK
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 250 OK
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK

-RCPT TO:<userx@domain1>
-450 Temporary error

 RCPT TO:<usery@domain1>
 RCPT TO:<usery@domain1>

-250 OK
-DATA
-354 Go ahead
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
-       (envelope-from <CALLER@test.ex>)
-       id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-Test message 2
-.
-250 OK
-MAIL FROM:<CALLER@test.ex>
-250 Sender OK
-RCPT TO:<userx@domain1>
-450 Temporary error
+450 Temporary error 3

 QUIT
 250 OK
 End of script
 QUIT
 250 OK
 End of script