diff options
| -rw-r--r-- | test/mail/0531.CALLER | 6 | ||||
| -rw-r--r-- | test/mail/4510.store | 1 | ||||
| -rwxr-xr-x | test/runtest | 7 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0531 | 9 | ||||
| -rw-r--r-- | test/scripts/4510-DKIM-Bounces/4510 | 1 | ||||
| -rw-r--r-- | test/stdout/0531 | 6 |
6 files changed, 14 insertions, 16 deletions
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER index 4d714c756..b31f69571 100644 --- a/test/mail/0531.CALLER +++ b/test/mail/0531.CALLER @@ -46,7 +46,7 @@ Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +1:This is a test message. --NNNNNNNNNN-eximdsn-MMMMMMMMMM-- @@ -99,7 +99,7 @@ Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +2: This is a test message. --NNNNNNNNNN-eximdsn-MMMMMMMMMM-- @@ -153,7 +153,7 @@ Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +3: This is a test message. --NNNNNNNNNN-eximdsn-MMMMMMMMMM-- diff --git a/test/mail/4510.store b/test/mail/4510.store index d75e40906..d117b34c6 100644 --- a/test/mail/4510.store +++ b/test/mail/4510.store @@ -37,6 +37,7 @@ Reporting-MTA: dns; myhost.test.ex Action: failed Final-Recipient: rfc822;baduser@test.ex Status: 5.0.0 +Remote-MTA: dns; ip4.ip4.ip4.ip4 Diagnostic-Code: smtp; 550 PRDR R=<baduser@test.ex> refusal --NNNNNNNNNN-eximdsn-MMMMMMMMMM diff --git a/test/runtest b/test/runtest index 3016e5df6..1ee61a5a1 100755 --- a/test/runtest +++ b/test/runtest @@ -1145,13 +1145,6 @@ RESET_AFTER_EXTRA_LINE_READ: next if / Berkeley DB error: /; } - elsif ($is_mail) - { - # Experimental_DSN info in bounces - next if /^Remote-MTA: /; - next if /^X-Exim-Diagnostic: /; - } - # ======== All files other than stderr ======== print MUNGED; diff --git a/test/scripts/0000-Basic/0531 b/test/scripts/0000-Basic/0531 index 912fff62a..a943f7fb5 100644 --- a/test/scripts/0000-Basic/0531 +++ b/test/scripts/0000-Basic/0531 @@ -23,7 +23,8 @@ QUIT 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. # @@ -44,7 +45,8 @@ QUIT 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. @@ -81,6 +83,7 @@ QUIT 250 OK **** exim -odi userx@test.ex -This is a test message. + +3: This is a test message. **** no_msglog_check diff --git a/test/scripts/4510-DKIM-Bounces/4510 b/test/scripts/4510-DKIM-Bounces/4510 index 531dbdafd..aa7f7ddc6 100644 --- a/test/scripts/4510-DKIM-Bounces/4510 +++ b/test/scripts/4510-DKIM-Bounces/4510 @@ -1,4 +1,5 @@ # DKIM signing and bounces +munge optional_dsn_info # exim -bd -DSERVER=server -oX PORT_D **** diff --git a/test/stdout/0531 b/test/stdout/0531 index 01438bd35..9691d20bc 100644 --- a/test/stdout/0531 +++ b/test/stdout/0531 @@ -21,7 +21,7 @@ Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +1:This is a test message. . 450 TEMPERROR 250 OK @@ -48,7 +48,7 @@ Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +2: This is a test message. . 450 TEMPERROR QUIT @@ -74,7 +74,7 @@ Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This is a test message. +2: This is a test message. . 450 TEMPERROR QUIT |