From: Jeremy Harris Date: Sun, 15 Dec 2019 15:58:25 +0000 (+0000) Subject: Testsuite: output changes resulting X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/3b3e6617a45743290ff2428d9a23ab77e137886b Testsuite: output changes resulting Broken-by: 78598e6a6a --- diff --git a/test/confs/5730 b/test/confs/5730 index c7d07bf3c..0279cf10e 100644 --- a/test/confs/5730 +++ b/test/confs/5730 @@ -59,6 +59,7 @@ check_data: logger: accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}} + accept condition = ${if eq {host} {${listextract{2}{$event_name}}}} warn logwrite = client ocsp status: $tls_out_ocsp \ (${listextract {${eval:$tls_out_ocsp+1}} \ {notreq:notresp:vfynotdone:failed:verified}}) diff --git a/test/confs/5740 b/test/confs/5740 index 60c175b53..32423f137 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -61,6 +61,7 @@ check_data: logger: accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}} + accept condition = ${if eq {host} {${listextract{2}{$event_name}}}} warn logwrite = client ocsp status: $tls_out_ocsp \ (${listextract {${eval:$tls_out_ocsp+1}} \ {notreq:notresp:vfynotdone:failed:verified}}) diff --git a/test/log/5700 b/test/log/5700 index d50c67cd1..6bf83896c 100644 --- a/test/log/5700 +++ b/test/log/5700 @@ -48,6 +48,8 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO the.local.host.name: Connection timed out 1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:host:defer 1999-03-02 09:44:33 10HmaZ-0005vi-00 . host deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part domain errno errstr router transport +1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:defer +1999-03-02 09:44:33 10HmaZ-0005vi-00 . message deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part domain errno errstr router transport 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO the.local.host.name 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1: retry timeout exceeded 1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:fail:delivery @@ -101,31 +103,55 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 . finished: 10HmbB-0005vi-00 1999-03-02 09:44:33 End queue run: pid=pppp -qqf 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbC-0005vi-00 cancelled by CALLER -1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:fail:internal -1999-03-02 09:44:33 10HmbC-0005vi-00 . local_part domain reason -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: R=dump_bounces -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:complete -1999-03-02 09:44:33 10HmbD-0005vi-00 . finished: 10HmbD-0005vi-00 +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect +1999-03-02 09:44:33 10HmbC-0005vi-00 . [127.0.0.1]:1111 +1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect +1999-03-02 09:44:33 10HmbC-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:PORT_S +1999-03-02 09:44:33 10HmbC-0005vi-00 . banner <220 ESMTP> +1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:ehlo +1999-03-02 09:44:33 10HmbC-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:PORT_S +1999-03-02 09:44:33 10HmbC-0005vi-00 . ehlo-resp <250-OK\n250 HELP> +1999-03-02 09:44:33 10HmbC-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 post-data problem +1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:close +1999-03-02 09:44:33 10HmbC-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:PORT_S +1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:defer +1999-03-02 09:44:33 10HmbC-0005vi-00 . message deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part domain errno <-46> errstr router transport +1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@domain1 R=others T=smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 post-data problem +1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@domain1: retry timeout exceeded +1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:fail:delivery +1999-03-02 09:44:33 10HmbC-0005vi-00 . refused by fdqn <127.0.0.1> local_part domain errstr +1999-03-02 09:44:33 10HmbC-0005vi-00 userx@domain1: error ignored 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbC-0005vi-00 . finished: 10HmbC-0005vi-00 -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:fail:internal -1999-03-02 09:44:33 10HmbE-0005vi-00 . local_part domain reason +1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbD-0005vi-00 cancelled by CALLER +1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbD-0005vi-00 . local_part domain reason +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: R=dump_bounces +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbE-0005vi-00 . finished: 10HmbE-0005vi-00 -1999-03-02 09:44:33 10HmbE-0005vi-00 removed by CALLER -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:complete +1999-03-02 09:44:33 10HmbD-0005vi-00 . finished: 10HmbD-0005vi-00 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbF-0005vi-00 address marked delivered by CALLER 1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:fail:internal 1999-03-02 09:44:33 10HmbF-0005vi-00 . local_part domain reason -1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:fail:internal -1999-03-02 09:44:33 10HmbF-0005vi-00 . local_part domain reason 1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbF-0005vi-00 . finished: 10HmbF-0005vi-00 1999-03-02 09:44:33 10HmbF-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbG-0005vi-00 address marked delivered by CALLER +1999-03-02 09:44:33 10HmbG-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbG-0005vi-00 . local_part domain reason +1999-03-02 09:44:33 10HmbG-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbG-0005vi-00 . local_part domain reason +1999-03-02 09:44:33 10HmbG-0005vi-00 event msg:complete +1999-03-02 09:44:33 10HmbG-0005vi-00 . finished: 10HmbG-0005vi-00 +1999-03-02 09:44:33 10HmbG-0005vi-00 removed by CALLER +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed diff --git a/test/log/5703 b/test/log/5703 index ac98fc9d9..1eb5e3505 100644 --- a/test/log/5703 +++ b/test/log/5703 @@ -21,6 +21,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to initial connection 1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:host:defer 1999-03-02 09:44:33 10HmaY-0005vi-00 . host deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part domain errno <-18> errstr router transport +1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:defer +1999-03-02 09:44:33 10HmaY-0005vi-00 . message deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part domain errno <-18> errstr router transport 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@the.local.host.name R=route_smtp T=smtp defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to initial connection 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@the.local.host.name: retry timeout exceeded 1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:fail:delivery diff --git a/test/stdout/5700 b/test/stdout/5700 index 98ba767c1..6d897d3b7 100644 --- a/test/stdout/5700 +++ b/test/stdout/5700 @@ -1,6 +1,6 @@ -Message 10HmbE-0005vi-00 has been removed -Message 10HmbF-0005vi-00 has been modified Message 10HmbF-0005vi-00 has been removed +Message 10HmbG-0005vi-00 has been modified +Message 10HmbG-0005vi-00 has been removed ******** SERVER ******** Listening on port 1224 ... @@ -87,3 +87,29 @@ RCPT TO: QUIT 220 OK End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO the.local.host.name +250-OK +250 HELP +MAIL FROM:<> +250 OK +RCPT TO: +250 OK +DATA +354 +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +A message which will get deferred after data +. +450 post-data problem +QUIT +220 OK +End of script