Sync 4.next from master

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0531

diff --git a/test/scripts/0000-Basic/0531 b/test/scripts/0000-Basic/0531
index 5e89595b78055a28636cdb600fa720f3323cfa98..a943f7fb53faaee9053016e4c62587c73d8352d3 100644 (file)
--- a/test/scripts/0000-Basic/0531
+++ b/test/scripts/0000-Basic/0531
@@ -1,5 +1,6 @@
 # LMTP over TCP/IP - temporary error handling
 need_ipv4
 # LMTP over TCP/IP - temporary error handling
 need_ipv4

+munge optional_dsn_info

 # This one has no retry time, so will be bounced immediately.
 #
 server PORT_S
 # This one has no retry time, so will be bounced immediately.
 #
 server PORT_S


@@ -22,7 +23,8 @@ QUIT
 250 OK
 ****
 exim -odi userx@test.ex usery@test.ex
 250 OK
 ****
 exim -odi userx@test.ex usery@test.ex

-This is a test message.
+
+1:This is a test message.

 ****
 # This one has a retry time, so will be deferred.
 #
 ****
 # This one has a retry time, so will be deferred.
 #


@@ -43,7 +45,8 @@ QUIT
 250 OK
 ****
 exim -odi userx@retry.test.ex
 250 OK
 ****
 exim -odi userx@retry.test.ex

-This is a test message.
+
+2: This is a test message.

 ****
 sleep 1
 # Should by now have exceeded retry time.
 ****
 sleep 1
 # Should by now have exceeded retry time.


@@ -80,6 +83,7 @@ QUIT
 250 OK
 ****
 exim -odi userx@test.ex
 250 OK
 ****
 exim -odi userx@test.ex

-This is a test message.
+
+3: This is a test message.

 ****
 no_msglog_check
 ****
 no_msglog_check