diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-07 12:48:06 +0000 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-08 16:15:46 +0000 |
commit | d658adda50d19b00d2242c0f9162ab510ecda799 (patch) | |
tree | 7866b79dca256217dbd1f99ba54cdeca4c722bc4 /test/scripts | |
parent | 3b9575827ae9b7847929d99ded489772eac73443 (diff) |
Testsuite: Add munge for EXPERIMENTAL_DSN_INFO
Diffstat (limited to 'test/scripts')
-rw-r--r-- | test/scripts/0000-Basic/0211 | 1 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0253 | 1 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0374 | 1 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0375 | 1 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0531 | 1 | ||||
-rw-r--r-- | test/scripts/4200-International/4203 | 1 | ||||
-rw-r--r-- | test/scripts/4210-GnuTLS-International/4213 | 1 | ||||
-rw-r--r-- | test/scripts/4220-OpenSSL-International/4223 | 1 | ||||
-rw-r--r--[l---------] | test/scripts/4700-dsn-info/4700 | 42 |
9 files changed, 49 insertions, 1 deletions
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 index e480f3494..d0dd4f363 120000..100644 --- a/test/scripts/4700-dsn-info/4700 +++ b/test/scripts/4700-dsn-info/4700 @@ -1 +1,41 @@ -../0000-Basic/0211
\ No newline at end of file +# 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 +**** |