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

[exim.git] / test / stderr / 0584

diff --git a/test/stderr/0584 b/test/stderr/0584
index 32ce9e762a5b41d5ed6d7f456ad7ac618d010965..a15f0f04855ba9006d159b0f81e66ad531676298 100644 (file)
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -15,9 +15,9 @@
 >>> check verify = sender=userx@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
 >>> check verify = sender=userx@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex

->>> userx in "userx"?
+>>> userx in local_parts?

 >>>  list element: userx
 >>>  list element: userx

->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")

 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------


@@ -44,9 +44,9 @@ LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
 >>> check verify = sender=fail@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@test.ex
 >>> check verify = sender=fail@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@test.ex

->>> fail in "userx"?
+>>> fail in local_parts?

 >>>  list element: userx
 >>>  list element: userx

->>> fail in "userx"? no (end of list)
+>>> fail in local_parts? no (end of list)

 >>> no more routers
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> no more routers
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"


@@ -71,9 +71,9 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende
 >>>              = sender=userx@test.ex/defer_ok
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
 >>>              = sender=userx@test.ex/defer_ok
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex

->>> userx in "userx"?
+>>> userx in local_parts?

 >>>  list element: userx
 >>>  list element: userx

->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")

 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------