X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/727071f81598850285bc4f6270a5bd9ad40c61ba..f3d11401d1cf97be77dbaa3246e06d07809f48b5:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index ca5e45e60..a7a266418 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -84,17 +84,18 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex SMTP<< 250 OK +127.0.0.1 in hosts_avoid_pipelining? no (option unset) 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 451 Temporary error LOG: MAIN - SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + 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 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK -address match: subject=*@127.0.0.1 pattern=* +address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") checking status of V4NET.0.0.0 @@ -107,16 +108,9 @@ V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y) Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error LOG: MAIN - V4NET.0.0.0 [V4NET.0.0.0] Network Error + 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] 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 -locking TESTSUITE/spool/db/wait-smtp.lockfile -locked TESTSUITE/spool/db/wait-smtp.lockfile -EXIM_DBOPEN(TESTSUITE/spool/db/wait-smtp) -returned from EXIM_DBOPEN -opened hints database TESTSUITE/spool/db/wait-smtp: flags=O_RDWR -dbfn_read: key=V4NET.0.0.0 -dbfn_write: key=V4NET.0.0.0 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish @@ -126,7 +120,7 @@ reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess reading retry information for R:x@y from subprocess added retry item LOG: MAIN - == x@y R=r1 T=smtp defer (dd): Network Error + == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1] changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 @@ -140,7 +134,7 @@ locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR -address match: subject=x@y pattern=* +address match test: subject=x@y pattern=* y in "*"? yes (matched "*") x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 @@ -148,23 +142,24 @@ dbfn_read: key=R:x@y failing_interval=ttt message_age=ttt Writing retry data for R:x@y first failed=dddd last try=dddd next try=+1 expired=1 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error dbfn_write: key=R:x@y -address match: subject=*@V4NET.0.0.0 pattern=* +address match test: subject=*@V4NET.0.0.0 pattern=* V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 failing_interval=ttt message_age=ttt +on queue longer than maximum retry Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 - first failed=dddd last try=dddd next try=+1 expired=1 + first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded end of retry processing -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -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 @@ -230,6 +225,7 @@ Considering: CALLER@myhost.test.ex unique = CALLER@myhost.test.ex dbfn_read: key=R:myhost.test.ex dbfn_read: key=R:CALLER@myhost.test.ex +dbfn_read: key=R:CALLER@myhost.test.ex:<> no domain retry record no address retry record CALLER@myhost.test.ex: queued for routing @@ -240,7 +236,7 @@ local_part=CALLER domain=myhost.test.ex checking local_parts CALLER in "CALLER"? yes (matched "CALLER") checking senders -address match: subject= pattern= +address match test: subject= pattern= in ":"? yes (matched "") calling r0 router rda_interpret (string): :blackhole: