Collect spool-layout code to one file

[users/jgh/exim.git] / test / stderr / 0420

diff --git a/test/stderr/0420 b/test/stderr/0420
index 6694987ced988d242ebcd2240ad21f1037324547..886eb12eb4685151359911528325475e84638323 100644 (file)
--- a/test/stderr/0420
+++ b/test/stderr/0420
@@ -26,8 +26,10 @@ SMTP<< mail from:<x@y>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 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<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
@@ -37,6 +39,7 @@ host in ignore_fromline_hosts? no (option unset)
 search_tidyup called
 >>Headers after rewriting and local additions:
 
+Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 * Received: ; Tue, 2 Mar 1999 09:44:33 +0000
@@ -50,8 +53,10 @@ SMTP<< mail from:<a@b>
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 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<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
@@ -61,6 +66,7 @@ host in ignore_fromline_hosts? no (option unset)
 search_tidyup called
 >>Headers after rewriting and local additions:
 
+Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: some text; Tue, 2 Mar 1999 09:44:33 +0000