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

[exim.git] / test / scripts / 0000-Basic / 0301

diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index f84244f05dbd16480a60da130f6e2bdd9b0cd785..45a8242850d61b07cb1559fabcb1b60f6b51d9a0 100644 (file)
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -1,5 +1,6 @@
 # SMTP synchronization checks disabled, with and without PIPELINING
 need_ipv4
 # SMTP synchronization checks disabled, with and without PIPELINING
 need_ipv4

+munge sync_check_data

 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****


@@ -9,6 +10,7 @@ ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 ??? 250
 quit
 ??? 250
 ??? 250
 quit


@@ -20,15 +22,15 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 250
 ??? 354
 the message
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 250
 ??? 354
 the message

-.
+.\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message

 ??? 250
 ??? 250

-mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message

 ??? 250
 ??? 250
 ??? 354
 ??? 250
 ??? 250
 ??? 354


@@ -44,6 +46,7 @@ ehlo en.force
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 .
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 .