diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-09-19 13:59:22 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-09-19 16:31:37 +0100 |
commit | 6f6dedccb47f231a0712d882da20feffbac8d0bc (patch) | |
tree | 32c098794a1df4cacf008677a1491f0b2389aca7 /test | |
parent | 14b3c5bc64a16df07583fe4b5ef2e0129d063893 (diff) |
Retry: always use interface, if set, for retry DB key. Bug 1678
Even constant values must be used, as multiple transports with
different values may be in play and should be kept distinct.
Diffstat (limited to 'test')
-rw-r--r-- | test/confs/0610 | 65 | ||||
-rw-r--r-- | test/log/0610 | 13 | ||||
-rw-r--r-- | test/rejectlog/0610 | 4 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0610 | 33 | ||||
-rw-r--r-- | test/stderr/0143 | 2 | ||||
-rw-r--r-- | test/stdout/0610 | 16 |
6 files changed, 132 insertions, 1 deletions
diff --git a/test/confs/0610 b/test/confs/0610 new file mode 100644 index 000000000..f805c086c --- /dev/null +++ b/test/confs/0610 @@ -0,0 +1,65 @@ +# Exim test configuration 0610 + +SERVER = + +exim_path = EXIM_PATH +host_lookup_order = bydns +#primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/SERVER%slog +log_selector = +sender_on_delivery +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +acl_smtp_connect = conn_chk +acl_smtp_rcpt = accept + +untrusted_set_sender = * +queue_only +queue_run_in_order + +# ----- ACL ----- + +begin acl + +conn_chk: + defer condition = ${if eq {SERVER}{server}} + accept + +# ----- Routers ----- + +begin routers + +client: + driver = accept + transport = $sender_address_local_part + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = 127.0.0.1 + +t2: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + interface = 127.0.0.2 + +# ----- Retry ----- + +begin retry + +* * F,5d,10s + +# End + diff --git a/test/log/0610 b/test/log/0610 new file mode 100644 index 000000000..d9e584b6d --- /dev/null +++ b/test/log/0610 @@ -0,0 +1,13 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= t1@dustyshoes.tld U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 <= t2@dustybelt.tld U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@anotherone.tld R=client T=t1 defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +1999-03-02 09:44:33 10HmaY-0005vi-00 == fred@anotherone.tld R=client T=t2 defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +1999-03-02 09:44:33 End queue run: pid=pppp -qq + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL +1999-03-02 09:44:33 H=[127.0.0.2] temporarily rejected connection in "connect" ACL diff --git a/test/rejectlog/0610 b/test/rejectlog/0610 new file mode 100644 index 000000000..c1384b3de --- /dev/null +++ b/test/rejectlog/0610 @@ -0,0 +1,4 @@ + +******** SERVER ******** +1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL +1999-03-02 09:44:33 H=[127.0.0.2] temporarily rejected connection in "connect" ACL diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610 new file mode 100644 index 000000000..ff690f63f --- /dev/null +++ b/test/scripts/0000-Basic/0610 @@ -0,0 +1,33 @@ +# retry: transport with fixed interface +# Exim test configuration 0610 +# +exim -DSERVER=server -bd -oX PORT_D +**** +# +exim -bs +MAIL FROM:<t1@dustyshoes.tld> +RCPT TO:<fred@anotherone.tld> +DATA +This is a test message. +. +RSET +MAIL FROM:<t2@dustybelt.tld> +RCPT TO:<fred@anotherone.tld> +DATA +Subject: second + +This is a second test message. +. +QUIT +**** +# +# +exim -qq +**** +# +# Should get two separate retry records. +dump retry +# +# +killdaemon +no_msglog_check diff --git a/test/stderr/0143 b/test/stderr/0143 index 054d65d28..cff499045 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -15,7 +15,7 @@ transport_name <my_smtp> my_smtp transport entered userx@domain.com checking status of 127.0.0.1 -127.0.0.1 [127.0.0.1]:1111 status = usable +127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP diff --git a/test/stdout/0610 b/test/stdout/0610 new file mode 100644 index 000000000..24291b53f --- /dev/null +++ b/test/stdout/0610 @@ -0,0 +1,16 @@ +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 the.local.host.name closing connection
++++++++++++++++++++++++++++ + T:127.0.0.1:127.0.0.1:1225/127.0.0.1 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +first failed = time last try = time2 next try = time2 + 10 + T:127.0.0.1:127.0.0.1:1225/127.0.0.2 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later +first failed = time last try = time2 next try = time2 + 10 |