Fix 2-phase, in-order queue run delivery order

[exim.git] / test / stderr / 0149

diff --git a/test/stderr/0149 b/test/stderr/0149
index 986177b4593f788400906495fd165547e28ea4e0..81bf94397b7d39d65c6cd6cdb4b62b0e1ec290a4 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,20 +1,20 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
-DSN: domainlist1 propagating DSN
-DSN: domainlist2 propagating DSN
-DSN: local propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten
 --------> domainlist1 router <--------
 local_part=x domain=ten
 checking domains
+ten in "<- test1 - test2-test3--4"? no (end of list)
+ten in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@ten
   domain = ten
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
-original list of hosts = "<+V4NET.0.0.0+V4NET.0.0.1" options = byname
-expanded list of hosts = "<+V4NET.0.0.0+V4NET.0.0.1" options = byname
+original list of hosts = '<+V4NET.0.0.0+V4NET.0.0.1' options = 'byname'
+expanded list of hosts = '<+V4NET.0.0.0+V4NET.0.0.1' options = 'byname'
 finding IP address for V4NET.0.0.0
 calling host_find_byname
 finding IP address for V4NET.0.0.1
@@ -22,7 +22,7 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = ten
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
   envelope to: x@ten
   transport: <none>
@@ -33,13 +33,16 @@ routing y@two
 --------> domainlist1 router <--------
 local_part=y domain=two
 checking domains
+two in "<- test1 - test2-test3--4"? no (end of list)
+two in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for y@two
   domain = two
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+two in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
-original list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
-expanded list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
+original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
+expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4
@@ -47,7 +50,7 @@ calling host_find_byname
 queued for <unset> transport: local_part = y
 domain = two
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
   envelope to: y@two
   transport: <none>
@@ -72,7 +75,7 @@ set transport local_delivery
 queued for local_delivery transport: local_part = x
 domain = test1
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
   envelope to: x@test1
   transport: local_delivery
@@ -94,7 +97,7 @@ local router called for x@test2
 queued for local_delivery transport: local_part = x
 domain = test2
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
   envelope to: x@test2
   transport: local_delivery
@@ -116,7 +119,7 @@ local router called for x@test3-4
 queued for local_delivery transport: local_part = x
 domain = test3-4
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
   envelope to: x@test3-4
   transport: local_delivery
@@ -125,22 +128,28 @@ routing x@one
 --------> domainlist1 router <--------
 local_part=x domain=one
 checking domains
+one in "<- test1 - test2-test3--4"? no (end of list)
+one in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@one
   domain = one
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+one in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
+one in "two"? no (end of list)
 domainlist1 router declined for x@one
 --------> domainlist2 router <--------
 local_part=x domain=one
 checking domains
+one in domains? yes (end of list)
 calling domainlist2 router
 domainlist2 router called for x@one
   domain = one
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
+one in "six"? no (end of list)
 route_item = one   V4NET.0.0.2:V4NET.0.0.4 byname
-original list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
-expanded list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
+original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
+expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4
@@ -148,7 +157,7 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = one
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
   envelope to: x@one
   transport: <none>
@@ -159,21 +168,26 @@ routing x@six
 --------> domainlist1 router <--------
 local_part=x domain=six
 checking domains
+six in "<- test1 - test2-test3--4"? no (end of list)
+six in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@six
   domain = six
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+six in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
+six in "two"? no (end of list)
 domainlist1 router declined for x@six
 --------> domainlist2 router <--------
 local_part=x domain=six
 checking domains
+six in domains? yes (end of list)
 calling domainlist2 router
 domainlist2 router called for x@six
   domain = six
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
-original list of hosts = "<+V4NET.0.0.6+V4NET.0.0.7" options = byname
-expanded list of hosts = "<+V4NET.0.0.6+V4NET.0.0.7" options = byname
+original list of hosts = '<+V4NET.0.0.6+V4NET.0.0.7' options = 'byname'
+expanded list of hosts = '<+V4NET.0.0.6+V4NET.0.0.7' options = 'byname'
 finding IP address for V4NET.0.0.6
 calling host_find_byname
 finding IP address for V4NET.0.0.7
@@ -181,10 +195,10 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = six
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
   envelope to: x@six
   transport: <none>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>