Testsuite: fix munging for ipv6 dns

[exim.git] / test / stderr / 0139

diff --git a/test/stderr/0139 b/test/stderr/0139
index a329e1ce515a07f20d3319c90a306b7a271c4051..9adf879de73772819fc5673d4cd0b91eb2170f65 100644 (file)
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -70,9 +70,9 @@
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> userx in "userx"?
+>>> userx in local_parts?
 >>>  list element: userx
->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
@@ -84,9 +84,9 @@
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> userx in "userx"?
+>>> userx in local_parts?
 >>>  list element: userx
->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
@@ -95,9 +95,12 @@
 >>> check domains = +local_domains
 >>> exim.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  exim.test.ex in "exim.test.ex"?
->>>   list element: exim.test.ex
->>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   start sublist local_domains
+>>>    exim.test.ex in "exim.test.ex"?
+>>>    ╎list element: exim.test.ex
+>>>    ╎exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'exim.test.ex' value 'exim.test.ex'
 >>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -136,9 +139,12 @@
 >>> check domains = +local_domains
 >>> exim.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  exim.test.ex in "exim.test.ex"?
->>>   list element: exim.test.ex
->>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   start sublist local_domains
+>>>    exim.test.ex in "exim.test.ex"?
+>>>    ╎list element: exim.test.ex
+>>>    ╎exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'exim.test.ex' value 'exim.test.ex'
 >>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -415,9 +421,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -506,9 +512,9 @@ LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -597,9 +603,9 @@ LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -688,9 +694,9 @@ LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -779,9 +785,9 @@ LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -871,9 +877,9 @@ LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -963,8 +969,8 @@ LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"?
+>>> a in local_parts?
 >>>  list element: userx
->>> a in "userx"? no (end of list)
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.105]