Testsuite: sort output of retry DB dumps

[exim.git] / test / stderr / 0294

diff --git a/test/stderr/0294 b/test/stderr/0294
index 184cf9f41cc892f9d0f184af8b9d4e2ebd8a3eea..24da1eb2d377c2bd84ef6963f1058275774a7873 100644 (file)
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -12,18 +12,23 @@ SMTP<< mail from:<x@y>
 SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.25 sec
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.263 sec
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.276 sec
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.289 sec
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
@@ -52,6 +57,7 @@ rate limit MAIL: delay 1 sec
 SMTP>> 250 OK
 SMTP<< rcpt to:<two@z>
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
@@ -107,19 +113,23 @@ SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? no (end of list)
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
@@ -149,20 +159,24 @@ SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
 rate limit RCPT: delay 0.25 sec
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN