Use dsn_from for success-DSN messages. Bug 2404

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

diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index de3be10956feaa17b0e8045a57cbfc76d394a060..920f12b5d5353b6b2d58efed68f6e6ae3e201dd4 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
 # SMTP synchronization checks, with and without PIPELINING
 need_ipv4

+munge sync_check_data

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


@@ -16,6 +17,7 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

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


@@ -23,9 +25,8 @@ rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 354
 the message
 ??? 250
 ??? 354
 the message

-.
+.\r\nmail from:<userx@test.ex>

 +++ 1
 +++ 1

-mail from:<userx@test.ex>

 rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 ??? 250
 ??? 250
 rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 ??? 250
 ??? 250


@@ -47,6 +48,7 @@ client HOSTIPV4 PORT_D
 ehlo abcd
 ??? 250-
 ??? 250-
 ehlo abcd
 ??? 250-
 ??? 250-

+??? 250-

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


@@ -66,6 +68,7 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 rset\r\nquit
 ??? 250
 ??? 250
 rset\r\nquit
 ??? 250


@@ -77,6 +80,7 @@ client HOSTIPV4 PORT_D
 ehlo abcd
 ??? 250-
 ??? 250-
 ehlo abcd
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 rset\r\nquit
 ??? 554
 ??? 250
 rset\r\nquit
 ??? 554


@@ -88,6 +92,7 @@ ehlo dis.able
 ??? 250-
 ??? 250-
 ??? 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
 .
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 .