Testsuite: fix output for 615, missing spool dir

[users/jgh/exim.git] / test / stdout / 5402

diff --git a/test/stdout/5402 b/test/stdout/5402
index 252c82917a693cbba24bc254178cfd887c176ed6..c0548bae7cfbc9f6a18b12b683609145fec091a6 100644 (file)
--- a/test/stdout/5402
+++ b/test/stdout/5402
@@ -1,24 +1,55 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+

 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 myhost.test.ex\r
+250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]\r

 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r

-250-STARTTLS\r

 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 HELP\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=10HmaX-0005vi-00\r
+
+**** SMTP testing: that is not a real message id!
+

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

+
+**** SMTP testing session as if from host 1.2.3.4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+

 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 myhost.test.ex\r
+250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]\r

 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r

-250-STARTTLS\r

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

-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmaY-0005vi-00\r
+
+**** SMTP testing: that is not a real message id!
+

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

+
+******** SERVER ********
+Listening on port 1224 ... 
+Server timed out
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<verify@domain.com>
+250 OK
+QUIT
+220 OK
+Expected EOF read from client
+End of script