Testsuite: output changes resulting

[exim.git] / test / stderr / 2600

diff --git a/test/stderr/2600 b/test/stderr/2600
index 8bfaf1c92c1970e9650a800db40f58c574dc9169..592eb9711f0db8c96220dfe9b0d63b2f6271d4f4 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -178,7 +178,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -188,8 +188,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -209,17 +209,17 @@ host in "+relay_hosts"?
   host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? no (end of list)
   end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 34)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 34)
   message: relay not permitted
-deny: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": DENY
+deny: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -229,8 +229,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -251,11 +251,11 @@ host in "+relay_hosts"?
   host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? no (end of list)
   end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 34)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 34)
   message: relay not permitted
-deny: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": DENY
+deny: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
@@ -307,7 +307,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -317,8 +317,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -338,17 +338,17 @@ host in "+relay_hosts"?
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list)
   end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 34)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 34)
   message: relay not permitted
-deny: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": DENY
+deny: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -358,8 +358,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -380,11 +380,11 @@ host in "+relay_hosts"?
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list)
   end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 34)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 34)
   message: relay not permitted
-deny: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": DENY
+deny: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
@@ -436,7 +436,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -446,8 +446,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -467,12 +467,12 @@ host in "+relay_hosts"?
    ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   end sublist relay_hosts
   host in "+relay_hosts"? yes (matched "+relay_hosts")
-accept: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": ACCEPT
+accept: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 32)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 32)
 check domains = +local_domains
 d in "+local_domains"?
  list element: +local_domains
@@ -482,8 +482,8 @@ d in "+local_domains"?
    d in "@"? no (end of list)
   end sublist local_domains
 d in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 33)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 33)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -503,8 +503,8 @@ host in "+relay_hosts"?
    ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   end sublist relay_hosts
   host in "+relay_hosts"? yes (matched "+relay_hosts")
-accept: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": ACCEPT
+accept: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
@@ -586,15 +586,13 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@myhost.test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@myhost.test.ex
 unique = userx@myhost.test.ex
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 userx@myhost.test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@myhost.test.ex
@@ -632,9 +630,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@myhost.test.ex <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@myhost.test.ex> transport=t1
@@ -681,10 +676,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1239
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@myhost.test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@myhost.test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@myhost.test.ex