Retry once a single-item delivery from the queue, when lock causes no attempt

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index c8df6e5da4c1dbf9aab6082d267304e356a6d7a0..86e8fe38d0e4010370bc26cf413d597c041f436e 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -11,19 +11,21 @@ set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.e
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<>
 smtp_setup_msg entered
 SMTP<< mail from:<>

-SMTP>> 250 OK\r
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
+SMTP>> 250 OK

 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"

-processing "require"
+processing "require" (TESTSUITE/test-config 20)

 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="domain1"


@@ -47,8 +49,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router

-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1' (tainted)

 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1


@@ -70,7 +72,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"


@@ -94,8 +96,8 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------

-require: condition test succeeded
-processing "require"
+require: condition test succeeded in ACL "rcpt"
+processing "require" (TESTSUITE/test-config 23)

 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1
 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1


@@ -114,8 +116,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router

-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1' (tainted)

 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1


@@ -137,7 +139,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"


@@ -160,13 +162,15 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------

-require: condition test succeeded
-processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+require: condition test succeeded in ACL "rcpt"
+processing "accept" (TESTSUITE/test-config 25)
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>