Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index de3be10956feaa17b0e8045a57cbfc76d394a060..abc8fd14c45977bdca09025af2beba365468cb8c 100644 (file)
--- a/test/scripts/0000-Basic/0300
+++ b/test/scripts/0000-Basic/0300
@@ -1,5 +1,6 @@
 # SMTP synchronization checks, with and without PIPELINING
 need_ipv4
+munge sync_check_data
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
@@ -16,6 +17,8 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
+??? 250-
 ??? 250
 rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
@@ -23,9 +26,8 @@ rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 354
 the message
-.
+.\r\nmail from:<userx@test.ex>
 +++ 1
-mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 ??? 250
 ??? 250
@@ -47,6 +49,8 @@ client HOSTIPV4 PORT_D
 ehlo abcd
 ??? 250-
 ??? 250-
+??? 250-
+??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>
 ??? 554
@@ -66,6 +70,8 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
+??? 250-
 ??? 250
 rset\r\nquit
 ??? 250
@@ -77,6 +83,8 @@ client HOSTIPV4 PORT_D
 ehlo abcd
 ??? 250-
 ??? 250-
+??? 250-
+??? 250-
 ??? 250
 rset\r\nquit
 ??? 554
@@ -88,6 +96,8 @@ ehlo dis.able
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
+??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 .