diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-02 11:58:28 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-03 22:04:22 +0100 |
| commit | 087b6b26fa9be49f9ce52bf8941b5a69d1ec31ce (patch) | |
| tree | 28c61a40594834ae3d808e05b2e3ea6ead7f9bb1 /test/confs/2135 | |
| parent | 8c690dfdc2c09b4aebe32a077c67b41b8ee2a6f0 (diff) | |
Testsuite: stabilize output sequence for 2x35/6
Diffstat (limited to 'test/confs/2135')
| -rw-r--r-- | test/confs/2135 | 74 |
1 files changed, 30 insertions, 44 deletions
diff --git a/test/confs/2135 b/test/confs/2135 index 68762146c..f7f225746 100644 --- a/test/confs/2135 +++ b/test/confs/2135 @@ -1,7 +1,5 @@ # Exim test configuration 2135 -OPT = - .include DIR/aux-var/tls_conf_prefix .ifdef SERVER @@ -15,77 +13,65 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -acl_smtp_rcpt = check_rcpt -acl_smtp_data = check_data +.ifdef SERVER +acl_smtp_rcpt = srvr_rcpt +acl_smtp_data = srvr_data +.else +acl_smtp_rcpt = client_rcpt +acl_smtp_data = client_data +.endif log_selector = +received_recipients +outgoing_port -OPT + +.ifdef SERVER +queue_only +queue_run_in_order = true +.endif # ----- ACLs ----- begin acl -check_rcpt: +client_rcpt: accept - condition = ${if or { {!eq {SERVER}{server}} {= {$received_port}{PORT_S}} }} verify = recipient/callout=use_sender,hold - defer condition = ${if eq {SERVER}{server}} - local_parts = rcpt_defer + +client_data: accept -check_data: - warn logwrite = received on port $received_port - defer condition = ${if eq {SERVER}{server}} - condition = ${if eq {data_defer}{${local_part:$recipients}}} +srvr_rcpt: + defer local_parts = rcpt_defer accept -delay: - warn condition = ${if = {$received_port}{PORT_D}} - delay = 1s +srvr_data: + defer condition = ${if eq {data_defer}{${local_part:$recipients}}} accept # ----- Routers ----- begin routers -.ifdef SERVER - target: - driver = redirect - condition = ${if = {$received_port}{PORT_D}} - address_data = ${acl {delay}} - data = :blackhole: - -dut: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - -.else + driver = redirect + condition = ${if or {{eq {SERVER}{server}} {queue_running}}} + data = :blackhole: client: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = t1 - errors_to = "" - -.endif - + driver = manualroute + route_list= * 127.0.0.1::PORT_D + self = send + transport = t1 + errors_to = "" begin transports t1: - driver = smtp - port = PORT_D - tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem - tls_verify_cert_hostnames = : - + driver = smtp + tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = : # ----- Retry ----- begin retry * * F,5d,10s - # End |