From d658adda50d19b00d2242c0f9162ab510ecda799 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 7 Nov 2015 12:48:06 +0000 Subject: [PATCH] Testsuite: Add munge for EXPERIMENTAL_DSN_INFO --- ...5\207\340\244\271\340\245\210\340\244\202" | 2 - ...5\207\340\244\271\340\245\210\340\244\202" | 2 - ...5\207\340\244\271\340\245\210\340\244\202" | 2 - test/runtest | 4 ++ test/scripts/0000-Basic/0211 | 1 + test/scripts/0000-Basic/0253 | 1 + test/scripts/0000-Basic/0374 | 1 + test/scripts/0000-Basic/0375 | 1 + test/scripts/0000-Basic/0531 | 1 + test/scripts/4200-International/4203 | 1 + test/scripts/4210-GnuTLS-International/4213 | 1 + test/scripts/4220-OpenSSL-International/4223 | 1 + test/scripts/4700-dsn-info/4700 | 42 ++++++++++++++++++- 13 files changed, 53 insertions(+), 7 deletions(-) mode change 120000 => 100644 test/scripts/4700-dsn-info/4700 diff --git "a/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index df022c532..35c0ea79f 100644 --- "a/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -14,8 +14,6 @@ MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-body-linecount: 38 -X-message-linecount: 50 X-received-count: 1 --NNNNNNNNNN-eximdsn-MMMMMMMMMM diff --git "a/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index df022c532..35c0ea79f 100644 --- "a/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -14,8 +14,6 @@ MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-body-linecount: 38 -X-message-linecount: 50 X-received-count: 1 --NNNNNNNNNN-eximdsn-MMMMMMMMMM diff --git "a/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index df022c532..35c0ea79f 100644 --- "a/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -14,8 +14,6 @@ MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-body-linecount: 38 -X-message-linecount: 50 X-received-count: 1 --NNNNNNNNNN-eximdsn-MMMMMMMMMM diff --git a/test/runtest b/test/runtest index 6899caeff..7af30763b 100755 --- a/test/runtest +++ b/test/runtest @@ -1380,6 +1380,10 @@ $munges = 'debug_pid' => { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' }, + 'optional_dsn_info' => + { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' + } + }; diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211 index ddf99060b..2775d20ef 100644 --- a/test/scripts/0000-Basic/0211 +++ b/test/scripts/0000-Basic/0211 @@ -1,5 +1,6 @@ # SMTP connection & EHLO/HELO error responses (+log_sender_on_delivery) need_ipv4 +munge optional_dsn_info # server PORT_S 450 I'm busy diff --git a/test/scripts/0000-Basic/0253 b/test/scripts/0000-Basic/0253 index 56362e0db..e0936bb17 100644 --- a/test/scripts/0000-Basic/0253 +++ b/test/scripts/0000-Basic/0253 @@ -1,5 +1,6 @@ # return_path on appendfile and smtp transports need_ipv4 +munge optional_dsn_info # exim -odi -f abc@x.y.z userx Test message diff --git a/test/scripts/0000-Basic/0374 b/test/scripts/0000-Basic/0374 index 810efbda5..e41e2dcb1 100644 --- a/test/scripts/0000-Basic/0374 +++ b/test/scripts/0000-Basic/0374 @@ -1,5 +1,6 @@ # unseen without disable_logging and errors_to = "" need_ipv4 +munge optional_dsn_info # server -t 10 PORT_S 3 220 diff --git a/test/scripts/0000-Basic/0375 b/test/scripts/0000-Basic/0375 index 8d2608fb8..be4d7d3e7 100644 --- a/test/scripts/0000-Basic/0375 +++ b/test/scripts/0000-Basic/0375 @@ -1,5 +1,6 @@ # unseen with disable_logging and errors_to = "" or forced fail need_ipv4 +munge optional_dsn_info # server -t 10 PORT_S 7 220 diff --git a/test/scripts/0000-Basic/0531 b/test/scripts/0000-Basic/0531 index 5e89595b7..912fff62a 100644 --- 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 +munge optional_dsn_info # This one has no retry time, so will be bounced immediately. # server PORT_S diff --git a/test/scripts/4200-International/4203 b/test/scripts/4200-International/4203 index 862de0cbb..310cbd7ff 100644 --- a/test/scripts/4200-International/4203 +++ b/test/scripts/4200-International/4203 @@ -1,5 +1,6 @@ # Internationalised mail: forwarding fail # Exim test configuration 4203 +munge optional_dsn_info # exim -DSERVER=server -DOPTION="" -bd -oX PORT_D **** diff --git a/test/scripts/4210-GnuTLS-International/4213 b/test/scripts/4210-GnuTLS-International/4213 index 7979156f1..c5b4b084d 100644 --- a/test/scripts/4210-GnuTLS-International/4213 +++ b/test/scripts/4210-GnuTLS-International/4213 @@ -1,6 +1,7 @@ # Internationalised mail: forwarding fail # Exim test configuration 4213 gnutls +munge optional_dsn_info # exim -DSERVER=server -DOPTION="" -bd -oX PORT_D **** diff --git a/test/scripts/4220-OpenSSL-International/4223 b/test/scripts/4220-OpenSSL-International/4223 index 2a836a879..5178bf188 100644 --- a/test/scripts/4220-OpenSSL-International/4223 +++ b/test/scripts/4220-OpenSSL-International/4223 @@ -1,5 +1,6 @@ # Internationalised mail: forwarding fail # Exim test configuration 4223 +munge optional_dsn_info # exim -DSERVER=server -DOPTION="" -bd -oX PORT_D **** diff --git a/test/scripts/4700-dsn-info/4700 b/test/scripts/4700-dsn-info/4700 deleted file mode 120000 index e480f3494..000000000 --- a/test/scripts/4700-dsn-info/4700 +++ /dev/null @@ -1 +0,0 @@ -../0000-Basic/0211 \ No newline at end of file diff --git a/test/scripts/4700-dsn-info/4700 b/test/scripts/4700-dsn-info/4700 new file mode 100644 index 000000000..d0dd4f363 --- /dev/null +++ b/test/scripts/4700-dsn-info/4700 @@ -0,0 +1,41 @@ +# DSN extra information +need_ipv4 +# +server PORT_S +450 I'm busy +QUIT +250 OK +**** +exim -odi userx@domain1 +Test message 1 +**** +server PORT_S +220 Connected OK +EHLO +450 I'm busy +HELO +450 I'm busy +QUIT +250 OK +**** +exim -qf +**** +server PORT_S +550 Go away +QUIT +250 OK +**** +exim -qf +**** +server PORT_S +220 Connected OK +EHLO +550 Go away +HELO +550 Go away +QUIT +250 OK +**** +exim -odi userx@domain1 usery@domain2 +Test message 2 +**** -- 2.25.1