From 936fcb6fc957910826dc7f2fc349cdc0c3a456d6 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 6 Jun 2021 17:01:02 +0100 Subject: [PATCH 1/1] Testsuite: testcase for multiple listener sockets ready --- test/confs/0624 | 44 ++++++++++++++++++++++++++++++++++++ test/log/0624 | 20 ++++++++++++++++ test/rejectlog/0624 | 6 ++++- test/scripts/0000-Basic/0624 | 10 ++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 test/confs/0624 create mode 100644 test/log/0624 create mode 100644 test/scripts/0000-Basic/0624 diff --git a/test/confs/0624 b/test/confs/0624 new file mode 100644 index 000000000..2ffd0a18e --- /dev/null +++ b/test/confs/0624 @@ -0,0 +1,44 @@ +# Exim test configuration 0624 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +domainlist local_domains = test.ex +qualify_domain = test.ex +log_selector = +received_recipients +outgoing_port +millisec + +smtp_accept_max_per_host = ${acl {delay}}10 +remote_max_parallel = 3 + +acl_smtp_rcpt = discard + +# ----- ACL ----- +begin acl + +delay: + accept + delay = 2s + +# ----- Routers ----- +begin routers +r: + driver = accept + transport = smtp + +# ----- Trnasport ----- +begin transports +smtp: + driver = smtp + hosts = 127.0.0.1 + port = ${if eq {c}{$local_part} {PORT_D2}{PORT_D}} + allow_localhost + max_rcpt = 1 + +# ----- Retry ----- +begin retry +* * F,5d,1d + +# End + diff --git a/test/log/0624 b/test/log/0624 new file mode 100644 index 000000000..e87a520b5 --- /dev/null +++ b/test/log/0624 @@ -0,0 +1,20 @@ +2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for a@test.ex b@test.ex c@test.ex +2017-07-30 18:51:05.712 10HmaX-0005vi-00 => a@test.ex R=r T=smtp H=127.0.0.1 [127.0.0.1]:PORT_D C="250 OK id=10HmaY-0005vi-00" +2017-07-30 18:51:05.712 10HmaX-0005vi-00 => b@test.ex R=r T=smtp H=127.0.0.1 [127.0.0.1]:PORT_D C="250 OK id=10HmaZ-0005vi-00" +2017-07-30 18:51:05.712 10HmaX-0005vi-00 => c@test.ex R=r T=smtp H=127.0.0.1 [127.0.0.1]:PORT_D2 C="250 OK id=10HmbA-0005vi-00" +2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed + +******** SERVER ******** +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL +2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name +2017-07-30 18:51:05.712 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients) +2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => blackhole (RCPT ACL discarded recipients) +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL +2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name +2017-07-30 18:51:05.712 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients) +2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed diff --git a/test/rejectlog/0624 b/test/rejectlog/0624 index 86b0ed7e6..cfb1500fc 100644 --- a/test/rejectlog/0624 +++ b/test/rejectlog/0624 @@ -1 +1,5 @@ -1999-03-02 09:44:33 U=CALLER F= rejected RCPT + +******** SERVER ******** +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL +2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F= RCPT : discarded by RCPT ACL diff --git a/test/scripts/0000-Basic/0624 b/test/scripts/0000-Basic/0624 new file mode 100644 index 000000000..0c3db409d --- /dev/null +++ b/test/scripts/0000-Basic/0624 @@ -0,0 +1,10 @@ +# multiple listener sockets ready +# +exim -bd -DSERVER=server -oX '<, PORT_D,PORT_D2' +**** +exim a@test.ex b@test.ex c@test.ex +Subject: test mail +**** +# +sleep 8 +killdaemon -- 2.30.2