X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0f9c36e64b3ded09b1972515fc62a673e1be2b8d..b7d8bd46690148ae74f34d7eba55cc4f367ed20b:/test/stdout/0623

diff --git a/test/stdout/0623 b/test/stdout/0623
index 27103d94f..1c571c961 100644
--- a/test/stdout/0623
+++ b/test/stdout/0623
@@ -1,65 +1,133 @@
+Message 10HmaZ-0005vi-00 has been removed
+Message 10HmbB-0005vi-00 has been removed
 
-**** SMTP testing session as if from host 99.99.99.99
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
+******** SERVER ********
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+250 OK mail
+RCPT TO:<good@test.ex>
+250 OK rcpt
+DATA
+300 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 good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello tester [99.99.99.99]
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+.
+QUIT
+250 OK message data
+221 Closing connection
+End of script
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-hi there
+250 OK
+MAIL FROM:<>
+250 OK mail
+RCPT TO:<nopipe@test.ex>
+250 OK rcpt
+DATA
+300 go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for nopipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-**** SMTP testing: that is not a real message id!
+.
+250 OK message data
+*sleep 1
+<<QUIT
+Unexpected EOF read from client
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+250 OK mail
+RCPT TO:<tempreject@test.ex>
+250 OK rcpt
+DATA
+300 go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for tempreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+.
+QUIT
+451 Service not available
+221 Closing connection
+Expected EOF read from client
+End of script
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+250 OK mail
+RCPT TO:<permreject@test.ex>
+250 OK rcpt
+DATA
+300 go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbA-0005vi-00
+	for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-**** SMTP testing: that is not a real message id!
+.
+QUIT
+550 content rejected
+221 Closing connection
+Expected EOF read from client
+End of script
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+250 OK mail
+RCPT TO:<permreject@test.ex>
+250 OK rcpt
+DATA
+300 go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbB-0005vi-00
+	for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-221 the.local.host.name closing connection
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO tester
-??? 250
-<<< 250 the.local.host.name Hello tester [127.0.0.1]
->>> MAIL FROM:<a@test.ex>
-??? 250
-<<< 250 OK
->>> RCPT TO:<fred@good1.ex>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> .
-??? 250
-<<< 250 OK id=10HmaY-0005vi-00
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<b@test.ex>
-??? 250
-<<< 250 OK
->>> RCPT TO:<jim@good2.ex>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> .
-??? 250
-<<< 250 OK id=10HmaZ-0005vi-00
->>> QUIT
+.
+>*eof
 End of script
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello CALLER at tester
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-221 the.local.host.name closing connection