diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0553 | 63 | ||||
| -rw-r--r-- | test/log/0553 | 18 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0553 | 22 | ||||
| -rw-r--r-- | test/stderr/0553 | 2 |
4 files changed, 105 insertions, 0 deletions
diff --git a/test/confs/0553 b/test/confs/0553 new file mode 100644 index 000000000..bdbc8df48 --- /dev/null +++ b/test/confs/0553 @@ -0,0 +1,63 @@ +# Exim test configuration 0553 + +DCF = +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 +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +acl_smtp_rcpt = check_recipient + +queue_only + +# ----- ACL ----- + +begin acl + +check_recipient: + # Callouts accepted with a delay + accept senders = : + delay = 1s + + # Non-callouts do the callout + accept verify = recipient/callout + DCF + + +# ----- Routers ----- + +begin routers + +t1: + driver = manualroute + route_list = * 127.0.0.1 byname + self = send + transport = smtp + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + port = PORT_D + command_timeout = 2s + + +# ----- Retry ----- + +begin retry + +* * F,5d,10s + + +# End diff --git a/test/log/0553 b/test/log/0553 new file mode 100644 index 000000000..7c4feaef1 --- /dev/null +++ b/test/log/0553 @@ -0,0 +1,18 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@test.ex> +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@test.ex> +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@test.ex> +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx2@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx3@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf + +******** 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 SMTP connection from localhost (myhost.test.ex) [127.0.0.1] lost while reading message data (header) +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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/scripts/0000-Basic/0553 b/test/scripts/0000-Basic/0553 new file mode 100644 index 000000000..07dfb0bed --- /dev/null +++ b/test/scripts/0000-Basic/0553 @@ -0,0 +1,22 @@ +# callout autoflush +need_ipv4 +# +# Put a message on the queue (queue_only is set) +exim userx1@test.ex userx2@test.ex userx3@test.ex +**** +# This daemon is "old-style", without the flush +exim -DSERVER=server -DDCF=control=no_callout_flush -bd -oX PORT_D +**** +exim -qf +**** +sleep 1 +killdaemon +# +# This daemon should flush before delaying +exim -DSERVER=server -bd -oX PORT_D +**** +exim -qf +**** +sleep 1 +killdaemon +no_msglog_check diff --git a/test/stderr/0553 b/test/stderr/0553 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/0553 @@ -0,0 +1,2 @@ + +******** SERVER ******** |