diff options
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/0000-Basic/0209 | 10 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0543 | 47 |
2 files changed, 47 insertions, 10 deletions
diff --git a/test/scripts/0000-Basic/0209 b/test/scripts/0000-Basic/0209 index 3bb43f78f..30401c89c 100644 --- a/test/scripts/0000-Basic/0209 +++ b/test/scripts/0000-Basic/0209 @@ -48,16 +48,6 @@ MAIL FROM: 250 Sender OK RCPT TO: 450 Temporary error -RCPT TO: -250 OK -DATA -354 Go ahead -. -250 OK -MAIL FROM: -250 Sender OK -RCPT TO: -450 Temporary error QUIT 250 OK **** diff --git a/test/scripts/0000-Basic/0543 b/test/scripts/0000-Basic/0543 new file mode 100644 index 000000000..7ee6305f5 --- /dev/null +++ b/test/scripts/0000-Basic/0543 @@ -0,0 +1,47 @@ +# 4xx retries with 2nd message down one SMTP connection +need_ipv4 +# +# Put a message on the queue +exim -odq userx@domain1 +Test message 1 +**** +# Arrange a second message that's had a 4xx +server PORT_S +220 ESMTP +EHLO +250-OK +250 HELP +MAIL +250 OK +RCPT +451 Later, please +QUIT +220 OK +**** +exim -odi usery@domain1 +Test message 2 +**** +1 +dump wait-smtp +# A queue run will try these in order, since queue_run_in_order is set. +# Arrange that the first one is accepted, so it should fire up the second +# on the same connection. But it should respect the retry time. +server PORT_S +220 ESMTP +EHLO +250-OK +250 HELP +MAIL +250 OK +RCPT +250 OK +DATA +354 More... +. +250 OK +QUIT +250 OK +**** +exim -q -d-all+route +**** +no_msglog_check |