Testsuite: fix munging for ipv6 dns

[exim.git] / test / stderr / 0092

diff --git a/test/stderr/0092 b/test/stderr/0092
index 9df1800b513c905c5a7ad9d8298ec61b5252a24d..5be8bc63302812e7069af8f61850903652b5ab56 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -37,9 +37,12 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] D=qqs
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -68,34 +71,34 @@ LOG: smtp_connection MAIN
 try option message_size_limit
 host in host_lookup? no (option unset)
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
- ╭considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-  ╭considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+ ╭considering: ${if░eq░{V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
+  ╭considering: V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
   ├───────text: V4NET.0.0.1
-  ├considering: } {$sender_host_address} {2} {30}}s
-  ├──expanding: V4NET.0.0.1
+  ├considering: }░{$sender_host_address}░{2}░{30}}s
+  ├───expanded: V4NET.0.0.1
   ╰─────result: V4NET.0.0.1
-  ╭considering: $sender_host_address} {2} {30}}s
+  ╭considering: $sender_host_address}░{2}░{30}}s
   ├──────value: V4NET.0.0.1
-  ├considering: } {2} {30}}s
-  ├──expanding: $sender_host_address
+  ├considering: }░{2}░{30}}s
+  ├───expanded: $sender_host_address
   ╰─────result: V4NET.0.0.1
- ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
+ ├──condition: eq░{V4NET.0.0.1}░{$sender_host_address}
  ├─────result: true
-  ╭considering: 2} {30}}s
+  ╭considering: 2}░{30}}s
   ├───────text: 2
-  ├considering: } {30}}s
-  ├──expanding: 2
+  ├considering: }░{30}}s
+  ├───expanded: 2
   ╰─────result: 2
   ╭───scanning: 30}}s
   ├───────text: 30
   ├───scanning: }}s
-  ├──expanding: 30
-  ├─────result: 30
+  ├───expanded: 30
+  ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 2
  ├considering: s
  ├───────text: s
- ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+ ├───expanded: ${if░eq░{V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
  ╰─────result: 2s
 host in host_reject_connection? no (option unset)
 host in sender_unqualified_hosts? no (option unset)
@@ -105,18 +108,18 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 try option acl_smtp_connect
 try option smtp_banner
- ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ ╭considering: $smtp_active_hostname░ESMTP░Exim░$version_number░$tod_full
  ├──────value: myhost.test.ex
- ├considering:  ESMTP Exim $version_number $tod_full
- ├───────text:  ESMTP Exim 
- ├considering: $version_number $tod_full
+ ├considering: ░ESMTP░Exim░$version_number░$tod_full
+ ├───────text: ░ESMTP░Exim░
+ ├considering: $version_number░$tod_full
  ├──────value: x.yz
- ├considering:  $tod_full
- ├───────text:  
+ ├considering: ░$tod_full
+ ├───────text: ░
  ├considering: $tod_full
- ├──────value: Tue, 2 Mar 1999 09:44:33 +0000
- ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
- ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ ├──────value: Tue,░2░Mar░1999░09:44:33░+0000
+ ├───expanded: $smtp_active_hostname░ESMTP░Exim░$version_number░$tod_full
+ ╰─────result: myhost.test.ex░ESMTP░Exim░x.yz░Tue,░2░Mar░1999░09:44:33░+0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
@@ -127,7 +130,6 @@ test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.1]
 sender_rcvhost = [V4NET.0.0.1] (helo=test)
 set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1]
-try option spf_smtp_comment_template
 try option acl_smtp_helo
 SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1]
 SMTP<< mail from:userx@test.ex
@@ -209,12 +211,15 @@ exim: timed out while reading - message abandoned
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing verify@test.ex
->>> test.ex in "! +local_domains"?
->>>  list element: ! +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+>>>  test.ex in domains? no (matched "! +local_domains")
 >>> calling forward router
 >>> forward router declined for verify@test.ex
 >>> no more routers