Testsuite: more munge tweaks

[exim.git] / test / stderr / 0161

diff --git a/test/stderr/0161 b/test/stderr/0161
index dad95576f1a12eb2ea2fc9b8199db207363df8df..fe30eb05e4b8d51255814d30feb3b471d7a4649a 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -7,14 +7,19 @@ routing xx@mxt6.test.ex
 --------> failuphost router <--------
 local_part=xx domain=mxt6.test.ex
 checking domains
+mxt6.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt6.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=mxt6.test.ex
 checking domains
+mxt6.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
+main lookup for domain
 set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
@@ -34,24 +39,32 @@ routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+myhost.test.ex in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for myhost.test.ex@mxt1.test.ex
 --------> fail router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+myhost.test.ex in local_parts? no (end of list)
 fail router skipped: local_parts mismatch
 --------> self router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self router
 self router called for myhost.test.ex@mxt1.test.ex
@@ -80,24 +93,32 @@ routing xx@mxt1.test.ex
 --------> failuphost router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for xx@mxt1.test.ex
 --------> fail router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 fail router skipped: local_parts mismatch
 --------> self router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self router
 self router called for xx@mxt1.test.ex
@@ -112,6 +133,7 @@ self router passed for xx@mxt1.test.ex
 --------> self2 router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self2 router
 self2 router called for xx@mxt1.test.ex
@@ -140,14 +162,19 @@ routing xx@not-exist.test.ex
 --------> failuphost router <--------
 local_part=xx domain=not-exist.test.ex
 checking domains
+not-exist.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+not-exist.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=not-exist.test.ex
 checking domains
+not-exist.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@not-exist.test.ex
   domain = not-exist.test.ex
+main lookup for domain
 lookuphost router declined for xx@not-exist.test.ex
 "more" is false: skipping remaining routers
 no more routers
@@ -161,10 +188,13 @@ routing ff@mxt1.test.ex
 --------> failuphost router <--------
 local_part=ff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
 calling failuphost router
 failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
@@ -177,19 +207,25 @@ routing fff@mxt1.test.ex
 --------> failuphost router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+fff in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for fff@mxt1.test.ex
 --------> fail router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
 self_hostname=eximtesthost.test.ex
 calling fail router