diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/confs/0217 | 4 | ||||
-rw-r--r-- | test/log/0217 | 6 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0217 | 26 | ||||
-rw-r--r-- | test/stderr/0217 | 33 | ||||
-rw-r--r-- | test/stdout/0217 | 28 |
5 files changed, 96 insertions, 1 deletions
diff --git a/test/confs/0217 b/test/confs/0217 index 7ffc1b099..32c46e232 100644 --- a/test/confs/0217 +++ b/test/confs/0217 @@ -1,5 +1,7 @@ # Exim test configuration 0217 +HAP= + exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex @@ -43,7 +45,7 @@ send_to_server: command_timeout = 1s hosts = 127.0.0.1 port = PORT_S - + HAP # ----- Retry ----- diff --git a/test/log/0217 b/test/log/0217 index 4913cb03f..c4e582c90 100644 --- a/test/log/0217 +++ b/test/log/0217 @@ -119,3 +119,9 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 ** CALLER@test.ex R=bounce: just discard 1999-03-02 09:44:33 10HmbO-0005vi-00 CALLER@test.ex: error ignored 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed +1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbP-0005vi-00 => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmbP-0005vi-00 -> x@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmbP-0005vi-00 -> y@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmbP-0005vi-00 -> z@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmbP-0005vi-00 Completed diff --git a/test/scripts/0000-Basic/0217 b/test/scripts/0000-Basic/0217 index c91d24254..5722eb4d2 100644 --- a/test/scripts/0000-Basic/0217 +++ b/test/scripts/0000-Basic/0217 @@ -316,4 +316,30 @@ RCPT TO exim -odi a b c d e . **** +# Discard retry data +sudo rm DIR/spool/db/* +# +# Test hosts_avoid_pipelining +server PORT_S +220 Server ready +EHLO +250-OK +250 PIPELINING +MAIL FROM +250 OK +RCPT TO +250 OK +RCPT TO +250 OK +RCPT TO +250 OK +RCPT TO +250 OK +DATA +351 Send more +. +250 OK +**** +exim -v -odi -DHAP=hosts_avoid_pipelining=127.0.0.1 w x y z +**** no_msglog_check diff --git a/test/stderr/0217 b/test/stderr/0217 index 30ab686c2..32b046de1 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -228,3 +228,36 @@ LOG: MAIN CALLER@test.ex: error ignored LOG: MAIN Completed +LOG: MAIN + <= CALLER@test.ex U=CALLER P=local S=sss +delivering 10HmbP-0005vi-00 +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected + SMTP<< 220 Server ready + SMTP>> EHLO myhost.test.ex + SMTP<< 250-OK + 250 PIPELINING + SMTP>> MAIL FROM:<CALLER@test.ex> + SMTP<< 250 OK + SMTP>> RCPT TO:<w@test.ex> + SMTP<< 250 OK + SMTP>> RCPT TO:<x@test.ex> + SMTP<< 250 OK + SMTP>> RCPT TO:<y@test.ex> + SMTP<< 250 OK + SMTP>> RCPT TO:<z@test.ex> + SMTP<< 250 OK + SMTP>> DATA + SMTP<< 351 Send more + SMTP>> writing message and terminating "." + SMTP<< 250 OK + SMTP>> QUIT +LOG: MAIN + => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +LOG: MAIN + -> x@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +LOG: MAIN + -> y@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +LOG: MAIN + -> z@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] +LOG: MAIN + Completed diff --git a/test/stdout/0217 b/test/stdout/0217 index af856787b..be5634b31 100644 --- a/test/stdout/0217 +++ b/test/stdout/0217 @@ -289,3 +289,31 @@ RCPT TO:<a@test.ex> RCPT TO:<b@test.ex> 550 NO End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-OK +250 PIPELINING +MAIL FROM:<CALLER@test.ex> +250 OK +RCPT TO:<w@test.ex> +250 OK +RCPT TO:<x@test.ex> +250 OK +RCPT TO:<y@test.ex> +250 OK +RCPT TO:<z@test.ex> +250 OK +DATA +351 Send more +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) + id 10HmbP-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbP-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 OK +End of script |