Merge branch '4.next'

[exim.git] / test / stdout / 5700

diff --git a/test/stdout/5700 b/test/stdout/5700
index a45b44c87fa31ee15c83c9f542f785d99e95a2bc..6160c4384aa43d66a97fde4a2b5459d0e6e7626f 100644 (file)
--- a/test/stdout/5700
+++ b/test/stdout/5700
@@ -1,3 +1,6 @@
+Message 10HmbF-000000005vi-0000 has been removed
+Message 10HmbG-000000005vi-0000 has been modified
+Message 10HmbG-000000005vi-0000 has been removed
 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -6,7 +9,7 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
 250 OK
 RCPT TO:<userx@domain1>
 250 OK
@@ -14,9 +17,10 @@ DATA
 354 More...
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaY-0005vi-00
-       for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+       id 10HmaY-000000005vi-0000
+       for userx@domain1;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -32,17 +36,18 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
 250 OK
-RCPT TO:<userx@domain2>
+RCPT TO:<userx@expansionfail>
 250 OK
 DATA
 354 More...
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaX-0005vi-00
-       for userx@domain2; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000
+       for userx@expansionfail;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -58,3 +63,56 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 *sleep 4
 End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>
+250 OK
+RCPT TO:<userx@domain1>
+450 NOT RIGHT NOW
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>
+250 OK
+RCPT TO:<userx@domain1>
+550 GO AWAY
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@the.local.host.name>)
+       id 10HmbC-000000005vi-0000
+       for userx@domain1;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <CALLER@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message which will get deferred after data
+.
+450 post-data problem
+QUIT
+220 OK
+End of script