Make the retry_include_ip_address smtp transport option expanded. Bug 1545

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

diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index de3be10956feaa17b0e8045a57cbfc76d394a060..047dba410c15ec156d26661fd633e7b4ac2d5812 100644 (file)
--- a/test/scripts/0000-Basic/0300
+++ b/test/scripts/0000-Basic/0300
@@ -16,6 +16,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 +24,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 +47,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 +67,7 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

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


@@ -77,6 +79,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 +91,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
 .