diff options
| -rw-r--r-- | test/confs/0574 | 20 | ||||
| -rw-r--r-- | test/log/0574 | 9 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0574 | 4 |
3 files changed, 8 insertions, 25 deletions
diff --git a/test/confs/0574 b/test/confs/0574 index aa3e93a9e..722988a29 100644 --- a/test/confs/0574 +++ b/test/confs/0574 @@ -13,8 +13,7 @@ tls_advertise_hosts = log_selector = +received_recipients +sender_on_delivery -acl_smtp_rcpt = accept queue = \ - ${if or {{eq {SERVER}{server}}{eq {normal}{$local_part}}} {} {$local_part}} +acl_smtp_rcpt = accept queue = ${if eq {normal}{$local_part} {} {$local_part}} queue_only queue_run_in_order @@ -22,24 +21,17 @@ queue_run_in_order begin routers -dump: - driver = redirect - condition = ${if eq {SERVER}{server}{yes}{no}} - data = :blackhole: - all: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = out + driver = accept + transport = dump #--------------- begin transports -out: - driver = smtp - port = PORT_D +dump: + driver = pipe + command = true # End diff --git a/test/log/0574 b/test/log/0574 index 206a95f38..70b22192a 100644 --- a/test/log/0574 +++ b/test/log/0574 @@ -1,17 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qq -1999-03-02 09:44:33 10HmaX-0005vi-00 => normal@test.ex F=<CALLER@the.local.host.name> R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => normal <normal@test.ex> F=<CALLER@the.local.host.name> R=all T=dump 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qq 1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp -1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate@test.ex F=<CALLER@the.local.host.name> Q=alternate R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> Q=alternate R=all T=dump 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp - -******** 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 10HmaZ-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for normal@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name for alternate@test.ex diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574 index 53f7a5da1..162b51f85 100644 --- a/test/scripts/0000-Basic/0574 +++ b/test/scripts/0000-Basic/0574 @@ -1,9 +1,6 @@ # named queues # Exim test configuration 0574 # -exim -DSERVER=server -bd -oX PORT_D -**** -# exim -bs MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <normal@test.ex> @@ -32,5 +29,4 @@ exim -qGnosuchqueue exim -qGalternate **** # -killdaemon no_msglog_check |