Tidying: enum for smtp_write_mail_and_rcpt_cmds() retcodes

[exim.git] / test / stdout / 4001

diff --git a/test/stdout/4001 b/test/stdout/4001
index 2e84f986015eef1c20df89f27f977d234503e1aa..63b44505fef6508efadcc69bccff03befd526d84 100644 (file)
--- a/test/stdout/4001
+++ b/test/stdout/4001
@@ -1,5 +1,10 @@
+
+**** SMTP testing session as if from host 127.0.0.1
+**** 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
-250-myhost.test.ex Hello CALLER at test.ex\r
+250-myhost.test.ex Hello mailserver.test [127.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
@@ -7,37 +12,29 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
-221 myhost.test.ex closing connection\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.ex\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250 HELP\r
+250 OK id=10HmaX-000000005vi-0000\r
+
+**** SMTP testing: that is not a real message id!
+
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-550 Administrative prohibition\r
-221 myhost.test.ex closing connection\r
+250 OK id=10HmaY-000000005vi-0000\r
+
+**** SMTP testing: that is not a real message id!
 
-******** SERVER ********
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0
-<
-><summary code="11">
->*eof
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-<GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0
-<
->
->
->
-><detected type="foo">
-><name>wibble</name>
-><summary code="11">
->*eof
-End of script
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaZ-000000005vi-0000\r
+
+**** SMTP testing: that is not a real message id!
+
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbA-000000005vi-0000\r
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection\r