X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f3ebb786e451da973560f1c9d8cdb151d25108b5..18207bb52923bcd958c6bd2bcd363fa331a17362:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index e11ca71b3..939aba184 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -11,7 +11,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim - failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@y @@ -55,7 +55,7 @@ get[host|ipnode]byname[2] looked up these IP addresses: queued for smtp transport: local_part = x domain = y errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: x@y transport: smtp @@ -98,14 +98,15 @@ cmd buf flush ddd bytes LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 - SMTP>> QUIT -cmd buf flush ddd bytes + SMTP+> QUIT +cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP<< 250 OK SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") -set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish checking status of V4NET.0.0.0 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile @@ -120,6 +121,7 @@ LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 +set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess @@ -169,7 +171,7 @@ LOG: MAIN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -190,6 +192,7 @@ X-Failed-Recipients: x@y Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex +References: Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender @@ -204,6 +207,7 @@ search_tidyup called Auto-Submitted: auto-replied F From: Mail Delivery System T To: CALLER@myhost.test.ex + References: Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender @@ -222,7 +226,7 @@ Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -286,9 +290,9 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss @@ -296,4 +300,4 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>