diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0552 | 66 | ||||
| -rw-r--r-- | test/log/0552 | 19 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0552 | 20 |
3 files changed, 105 insertions, 0 deletions
diff --git a/test/confs/0552 b/test/confs/0552 new file mode 100644 index 000000000..3ce775148 --- /dev/null +++ b/test/confs/0552 @@ -0,0 +1,66 @@ +# Exim test configuration 0552 + +DDF= +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_not_smtp = check_not +acl_smtp_connect = check_connect +acl_smtp_rcpt = check_rcpt + +queue_only + +# ----- ACL ----- + +begin ACL + +check_connect: + accept DDF + +check_rcpt: + accept delay = 1s + +check_not: + accept delay = 1s + logwrite = Accept non-SMTP + + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = t1 + + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + port = PORT_D + hosts = 127.0.0.1 + allow_localhost + command_timeout = 2s + + +# ----- Retry ----- + +begin retry + +* * F,1d,1s + + +# End diff --git a/test/log/0552 b/test/log/0552 new file mode 100644 index 000000000..e5a1fd831 --- /dev/null +++ b/test/log/0552 @@ -0,0 +1,19 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 Accept non-SMTP +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=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 +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=r1 T=t1 H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx2@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx3@test.ex R=r1 T=t1 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 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 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/0552 b/test/scripts/0000-Basic/0552 new file mode 100644 index 000000000..1958dbe64 --- /dev/null +++ b/test/scripts/0000-Basic/0552 @@ -0,0 +1,20 @@ +# autoflush for delay +need_ipv4 +# +# Put a message on the queue (queue_only is set); this tests that a +# non-SMTP delay still works. +exim userx1@test.ex userx2@test.ex userx3@test.ex +**** +# This daemon is "old-style", without the flush +exim -DSERVER=server -DDDF=control=no_delay_flush -bd -oX PORT_D +**** +exim -qf +**** +killdaemon +# This daemon should flush before delaying +exim -DSERVER=server -bd -oX PORT_D +**** +exim -qf +**** +killdaemon +no_msglog_check |