From fe59aa70558b0e9a10a7ef349f579a0c9d5bcb46 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 9 Dec 2015 13:28:43 +0000 Subject: [PATCH] Testsuite: divert server log away from case 0611 to help with runtime ordering changes --- test/confs/0611 | 3 ++- test/log/0611 | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/test/confs/0611 b/test/confs/0611 index ddd882462..b52639198 100644 --- a/test/confs/0611 +++ b/test/confs/0611 @@ -7,13 +7,14 @@ exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME tls_advertise_hosts = # ----- Main settings ----- +log_file_path = DIR/spool/log/${if eq {SERVER}{server} {server_}{}}%slog + qualify_domain = test.ex queue_run_in_order log_selector = +received_recipients diff --git a/test/log/0611 b/test/log/0611 index f158a20e9..f6b206d45 100644 --- a/test/log/0611 +++ b/test/log/0611 @@ -1,20 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for a b c -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 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 == c@test.ex R=rmt_client T=smtp defer (-56): concurrency limit reached for transport -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=server -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for b@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: R=server -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for c@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=server -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -- 2.30.2