Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 20c2184bc585ff497521fc3df81c9862c1677774..d7a57c330c18f5964c9ce894706417d4134c798f 100644 (file)
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -1,27 +1,30 @@
 # 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
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 ??? 250
 quit
 ??? 221
 ****
 ??? 250
 ??? 250
 quit
 ??? 221
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

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


@@ -39,13 +42,14 @@ quit
 ??? 221
 ****
 # For this one, the check will be dyamically turned on again
 ??? 221
 ****
 # For this one, the check will be dyamically turned on again

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo en.force
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo en.force
 ??? 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
 .