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

[exim.git] / test / stderr / 5420

diff --git a/test/stderr/5420 b/test/stderr/5420
index b2b9792970adac9ea52608a8fef9e3b182a2f345..caa9e0de015c63847f7fc542e4d72d4af50461e9 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 environment after trimming:
  PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
@@ -95,7 +96,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
@@ -123,7 +123,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
@@ -635,7 +634,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -658,6 +656,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 environment after trimming:
  PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
@@ -754,7 +753,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
@@ -782,7 +780,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
@@ -1244,7 +1241,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1267,6 +1263,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 environment after trimming:
  PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
@@ -1363,7 +1360,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
@@ -1391,7 +1387,6 @@ domain.com in "*"?
  domain.com in "*"? yes (matched "*")
 try option transport
 try option unseen
-try option unseen
 try option interface
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
@@ -1853,7 +1848,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}