Testsuite: output changes resulting

Broken-by: 78598e6a6a

diff --git a/test/confs/5730 b/test/confs/5730
index c7d07bf3c688ba36b208250d7ff6d6ca2d3518dd..0279cf10ef02dfbf3fd5541c20e92e06a27831b0 100644 (file)
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -59,6 +59,7 @@ check_data:
 
 logger:
   accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
 
 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}})
   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 60c175b53863ae307cfa20d1866e307a6f256565..32423f137d634917a2a7efbe53ec9f4e4ea3dd73 100644 (file)
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -61,6 +61,7 @@ check_data:
 
 logger:
   accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
 
 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}})
   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 d50c67cd1bed7a48dca1cc908dfd37459e6a3ba7..6bf83896cc0596111e206634292fe8b915538c7c 100644 (file)
--- 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 <userx> domain <domain1> errno <EEE> errstr <SMTP timeout after EHLO the.local.host.name: Connection timed out> router <others> transport <smtp>
 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 <userx> domain <domain1> errno <EEE> errstr <SMTP timeout after EHLO the.local.host.name: Connection timed out> router <others> transport <smtp>

+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 <userx> domain <domain1> errno <EEE> errstr <SMTP timeout after EHLO the.local.host.name: Connection timed out> router <others> transport <smtp>

 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
 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 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 <userx> domain <domain1> reason <delivery cancelled by administrator>
-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: <CALLER@the.local.host.name> 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 <userx> domain <domain1> errno <-46> errstr <SMTP error from remote mail server after end of data: 450 post-data problem> router <others> transport <smtp>
+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 <userx> domain <domain1> errstr <SMTP error from remote mail server after end of data: 450 post-data problem: retry timeout exceeded>
+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 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 <userx> domain <domain1> reason <message removed by CALLER>
+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 <userx> domain <domain1> reason <delivery cancelled by administrator>
+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: <CALLER@the.local.host.name> 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 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 <= CALLER@the.local.host.name U=CALLER P=local S=sss

-1999-03-02 09:44:33 10HmbF-0005vi-00 address <usery@domain1> 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 <userx> domain <domain1> reason <message removed 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 <userx> domain <domain1> reason <message removed 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 <userz> domain <domain1> reason <message removed by CALLER>

 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 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 <usery@domain1> 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 <userx> domain <domain1> reason <message removed 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 <userz> domain <domain1> reason <message removed by CALLER>
+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 ac98fc9d9b02e6396dde8ef600eb1863f317ac66..1eb5e3505f3ee2dd5b065f392693de79b496d2db 100644 (file)
--- 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 <CALLER> domain <the.local.host.name> errno <-18> errstr <Remote host closed connection in response to initial connection> router <route_smtp> transport <smtp>
 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 <CALLER> domain <the.local.host.name> errno <-18> errstr <Remote host closed connection in response to initial connection> router <route_smtp> transport <smtp>

+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 <CALLER> domain <the.local.host.name> errno <-18> errstr <Remote host closed connection in response to initial connection> router <route_smtp> transport <smtp>

 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
 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 98ba767c1c4935b9a60052677f85e1f9c6a47cff..6d897d3b727e3433802c726ffe9a50414c497c6c 100644 (file)
--- 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 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 ... 
 
 ******** SERVER ********
 Listening on port 1224 ... 


@@ -87,3 +87,29 @@ RCPT TO:<userx@domain1>
 QUIT
 220 OK
 End of script
 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:<userx@domain1>
+250 OK
+DATA
+354
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@the.local.host.name>)
+       id 10HmbC-0005vi-00
+       for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@the.local.host.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