diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-10-08 23:59:27 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-10-13 01:29:55 +0100 |
| commit | fa41615da7020d4d951ed3a0b98464bed66ff58b (patch) | |
| tree | 5db01e6c3e1b6bafb19a319e212fd659aeea20c3 /test/scripts | |
| parent | e8ae721412364ffe473066063d9f3d0195b8b451 (diff) | |
max_parallel transport option
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/0000-Basic/0288 | 31 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0611 | 43 |
2 files changed, 73 insertions, 1 deletions
diff --git a/test/scripts/0000-Basic/0288 b/test/scripts/0000-Basic/0288 index 7b867cedb..ed381dad7 100644 --- a/test/scripts/0000-Basic/0288 +++ b/test/scripts/0000-Basic/0288 @@ -1,9 +1,12 @@ # serialize_hosts need_ipv4 # +# preload the spool exim -odq a b . **** +# +# a slow server as a test target server PORT_S 220 ESMTP EHLO @@ -21,6 +24,32 @@ DATA QUIT 250 OK **** +# +# First message should go; second does not wait for 1st complete +# on same conn due to connection_max_messages, then is deferred +# as second transport run aborted by serialize_hosts. +exim -q +**** +# +# a server as a test target +server PORT_S +220 ESMTP +EHLO +250-OK +250 HELP +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +. +250 OK +QUIT +250 OK +**** +# +# Remaining message on queue should go immediately; no delay +# associated with retry rules exim -q **** -no_msglog_check diff --git a/test/scripts/0000-Basic/0611 b/test/scripts/0000-Basic/0611 new file mode 100644 index 000000000..c35284147 --- /dev/null +++ b/test/scripts/0000-Basic/0611 @@ -0,0 +1,43 @@ +# max_parallel on transport +need_ipv4 +# +# Remote transport: +# preload the spool +exim -odq a b c +. +**** +# +# a slow server as a test target +exim -DSERVER=server -bd -oX PORT_D +**** +# +# First and second messages should go, as separate conns due to +# connection_max_messages, third is deferred +# as third transport run denied by max_parallel +exim -q +**** +# +# +# Remaining message on queue should go immediately; no delay +# associated with retry rules +exim -q +**** +killdaemon +# +######## +# +# +# Local transport: +# Only one message should go as the transport takes a long +# time and we set max_parallel=1 to serialize it +exim y +**** +exim z +**** +# +# +sleep 3 +# +# Remaining message on queue should go immediately; no delay +# associated with retry rules +exim -q |