Testsuite: output changes resulting

[exim.git] / test / stderr / 5403

diff --git a/test/stderr/5403 b/test/stderr/5403
index 3de6f402476efdfd2e637124b03ab06828758306..f76156797bf37190b34110954c8f8ee4d6d46ad1 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -20,19 +20,19 @@ LOG: no host name found for IP address 1.2.3.4
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"
->>> processing "warn" (TESTSUITE/test-config 21)
+>>> processing ACL ar "warn" (TESTSUITE/test-config 21)
 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for plain@domain.com
 LOG: rcpt for plain@domain.com
->>> warn: condition test succeeded in ACL "ar"
->>> processing "warn" (TESTSUITE/test-config 23)
+>>> warn: condition test succeeded in ACL ar
+>>> processing ACL ar "warn" (TESTSUITE/test-config 23)
 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = 
->>> warn: condition test failed in ACL "ar"
->>> processing "accept" (TESTSUITE/test-config 25)
->>> accept: condition test succeeded in ACL "ar"
->>> end of ACL "ar": ACCEPT
+>>> warn: condition test failed in ACL ar
+>>> processing ACL ar "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test succeeded in ACL ar
+>>> end of ACL ar: ACCEPT
 LOG: 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -56,30 +56,32 @@ LOG: no host name found for IP address 1.2.3.4
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "ar"
->>> processing "warn" (TESTSUITE/test-config 21)
+>>> processing ACL ar "warn" (TESTSUITE/test-config 21)
 >>> check control = cutthrough_delivery
 >>> check logwrite = rcpt for $local_part@$domain
 >>>                = rcpt for verify@domain.com
 LOG: rcpt for verify@domain.com
->>> warn: condition test succeeded in ACL "ar"
->>> processing "warn" (TESTSUITE/test-config 23)
+>>> warn: condition test succeeded in ACL ar
+>>> processing ACL ar "warn" (TESTSUITE/test-config 23)
 >>> check condition = ${if eq {verify}{$local_part}}
 >>>                 = true
 >>> check verify = recipient/callout=use_sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing verify@domain.com
->>> domain.com in "localhost.test.ex : localhost4.test.ex : thishost.test.ex"?
+>>> domain.com in domains?
 >>>  list element: localhost.test.ex
 >>>  list element: localhost4.test.ex
 >>>  list element: thishost.test.ex
->>> domain.com in "localhost.test.ex : localhost4.test.ex : thishost.test.ex"? no (end of list)
->>> domain.com in "! +local_domains"?
->>>  list element: ! +local_domains
->>>  domain.com in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>  domain.com in "test.ex : *.test.ex"? no (end of list)
->>> domain.com in "! +local_domains"? yes (end of list)
+>>> domain.com in domains? no (end of list)
+>>> domain.com in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    domain.com in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    domain.com in "test.ex : *.test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> domain.com in domains? yes (end of list)
 >>> calling all router
 >>> domain.com in "special.com"?
 >>>  list element: special.com
@@ -96,9 +98,10 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=PORT_S
->>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen?
->>>  list element: 
->>> >>>  connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...
+>>>  127.0.0.1 in hosts_try_fastopen?
+>>>   list element: 
+>>> connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
@@ -113,10 +116,10 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP<< 250 OK
 >>> holding verify callout open for cutthrough delivery
 >>> ----------- end verify ------------
->>> warn: condition test succeeded in ACL "ar"
->>> processing "accept" (TESTSUITE/test-config 25)
->>> accept: condition test succeeded in ACL "ar"
->>> end of ACL "ar": ACCEPT
+>>> warn: condition test succeeded in ACL ar
+>>> processing ACL ar "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test succeeded in ACL ar
+>>> end of ACL ar: ACCEPT
 >>>   SMTP>> QUIT
 >>>   SMTP<< 220 OK
 >>>   SMTP(close)>>