Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 08996c7efb223d92b6742d5a9bf82fc1a2b7d270..d7a57c330c18f5964c9ce894706417d4134c798f 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
 ****


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

+??? 250-

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


@@ -22,6 +24,7 @@ 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
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250


@@ -46,6 +49,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
 .