Testsuite: fix testcase for SPF empty-mailfrom-use-helo. Bug 467

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0618

diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618
index c093228445cc2f5230fcf1c25b592b4c7062165e..d43d13ca69e31108c173e10650c92b662796baee 100644 (file)
--- a/test/scripts/0000-Basic/0618
+++ b/test/scripts/0000-Basic/0618
@@ -1,112 +1,57 @@
-# DSN ESMTP extension RCPT options
+# free of local_part_data, domain_data, sender_data

 #
 #

-# Server does not advertise by default
-exim -DSERVER=server -bd -oX PORT_D
-****
-client 127.0.0.1 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250 HELP
+exim -bh 99.99.99.99
+HELO tester
+MAIL FROM:<a@test.ex>
+RCPT TO:<fred@good1.ex>
+DATA
+.
+RSET
+MAIL FROM:<b@test.ex>
+RCPT TO:<jim@good2.ex>
+DATA
+.
+QUIT

 ****
 ****

-killdaemon

 #
 #
 #
 #

-# Server does advertise when told.  Client requests no bounces, and this one gets a reject.
-exim -DSERVER=server -DOPT=y -bd -oX PORT_D
+exim -bd -DSERVER=server -oX PORT_D

 ****
 ****

-client HOSTIPV4 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ??? 220

-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<a@dump.ex>
-??? 250
-RCPT TO:<any@test.ex> NOTIFY=foo
-??? 501
-RCPT TO:<rmt_reject@test.ex> NOTIFY=never
+HELO tester

 ??? 250
 ??? 250

-DATA
-??? 354
-Subject: test
-.
+MAIL FROM:<a@test.ex>

 ??? 250
 ??? 250

-QUIT
-??? 221
-****
-# Client requests delivery notification; the server supports DSN to takes responsibility
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<b@dump.ex>
-??? 250
-RCPT TO:<rmt_accept@test.ex> NOTIFY=success
+RCPT TO:<fred@good1.ex>

 ??? 250
 DATA
 ??? 354
 ??? 250
 DATA
 ??? 354

-Subject: test

 .
 ??? 250
 .
 ??? 250

-QUIT
-??? 221
-****
-# Client requests notification of deferral.  First time of trying, the
-# queue-time probably has not hit the 1st retry time yet, so no DSN will
-# be sent and the message remains queued.
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<c@dump.ex>
+RSET

 ??? 250
 ??? 250

-RCPT TO:<rmt_defer@test.ex> NOTIFY=delay
+MAIL FROM:<b@test.ex>
+??? 250
+RCPT TO:<jim@good2.ex>

 ??? 250
 DATA
 ??? 354
 ??? 250
 DATA
 ??? 354

-Subject: test

 .
 ??? 250
 QUIT
 .
 ??? 250
 QUIT

-??? 221

 ****
 ****

-# Clients requests no DSNs, and this one gets deferred
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<d@dump.ex>
-??? 250
-RCPT TO:<rmt_defer@test.ex> NOTIFY=never
-??? 250
+killdaemon
+#
+#
+exim -bs
+HELO tester
+MAIL FROM:<a@test.ex>
+RCPT TO:<fred@good1.ex>

 DATA
 DATA

-??? 354
-Subject: test

 .
 .

-??? 250

 QUIT
 QUIT

-??? 221
-****
-# This attemmpt the set of all the above, for the first time.
-exim -q

 ****
 ****

-sleep 3
-# Second time, for the queued deferrals.  Final delivery for the acceptance.
-exim -q
-****
-killdaemon

 #
 #
 no_msglog_check
 #
 #
 no_msglog_check