Testsuite: tidying

[exim.git] / test / stdout / 0618

diff --git a/test/stdout/0618 b/test/stdout/0618
index 0fbac17d9b70975a0963c8f0023f8ed4188f4153..bd560e385aaf17813e36e9e57934059481318bd2 100644 (file)
--- a/test/stdout/0618
+++ b/test/stdout/0618
@@ -1,130 +1,65 @@
+
+**** SMTP testing session as if from host 99.99.99.99
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 the.local.host.name Hello tester [99.99.99.99]\r
+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!
+
+250 Reset OK\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbB-000000005vi-0000\r
+
+**** SMTP testing: that is not a real message id!
+
+221 the.local.host.name closing connection\r

 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220

-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250 HELP
-<<< 250 HELP
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<a@dump.ex>
-??? 250
-<<< 250 OK
->>> RCPT TO:<any@test.ex> NOTIFY=foo
-??? 501
-<<< 501 Invalid value for NOTIFY parameter
->>> RCPT TO:<rmt_reject@test.ex> NOTIFY=never
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
->>> .
+<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO tester

 ??? 250
 ??? 250

-<<< 250 OK id=10HmaX-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<b@dump.ex>
+<<< 250 the.local.host.name Hello tester [127.0.0.1]
+>>> MAIL FROM:<a@test.ex>

 ??? 250
 <<< 250 OK
 ??? 250
 <<< 250 OK

->>> RCPT TO:<rmt_accept@test.ex> NOTIFY=success
+>>> RCPT TO:<fred@good1.ex>

 ??? 250
 <<< 250 Accepted
 >>> DATA
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 ??? 250
 <<< 250 Accepted
 >>> DATA
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself

->>> Subject: test

 >>> .
 ??? 250
 >>> .
 ??? 250

-<<< 250 OK id=10HmaY-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<c@dump.ex>
-??? 250
-<<< 250 OK
->>> RCPT TO:<rmt_defer@test.ex> NOTIFY=delay
+<<< 250 OK id=10HmaY-000000005vi-0000
+>>> RSET

 ??? 250
 ??? 250

-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
->>> .
-??? 250
-<<< 250 OK id=10HmbB-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<d@dump.ex>
+<<< 250 Reset OK
+>>> MAIL FROM:<b@test.ex>

 ??? 250
 <<< 250 OK
 ??? 250
 <<< 250 OK

->>> RCPT TO:<rmt_defer@test.ex> NOTIFY=never
+>>> RCPT TO:<jim@good2.ex>

 ??? 250
 <<< 250 Accepted
 >>> DATA
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 ??? 250
 <<< 250 Accepted
 >>> DATA
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself

->>> Subject: test

 >>> .
 ??? 250
 >>> .
 ??? 250

-<<< 250 OK id=10HmbC-0005vi-00
+<<< 250 OK id=10HmaZ-000000005vi-0000

 >>> QUIT
 >>> QUIT

-??? 221
-<<< 221 myhost.test.ex closing connection

 End of script
 End of script

+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 the.local.host.name Hello CALLER at tester\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaX-000000005vi-0000\r
+221 the.local.host.name closing connection\r