From 5922c78c4b1f8f8c2b4ceede15470ae59f4b2da7 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 7 Dec 2012 11:49:15 +0000 Subject: [PATCH] More test updates following the retry fix. Most of these are due to the changes in the logging of ultimate timeout checks. Test 0548 is more meaningfully affected. The test originally failed to spot that the recipient-specific deferrals pushed past the ultimate retry timeout. --- test/log/0548 | 18 +++++++++++------- test/rejectlog/0548 | 4 +++- test/stderr/0476 | 3 --- test/stderr/0529 | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/log/0548 b/test/log/0548 index 2c2718c57..cc614394a 100644 --- a/test/log/0548 +++ b/test/log/0548 @@ -8,17 +8,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred -1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred -1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred +1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred 1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred -1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred -1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred +1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred 1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** @@ -27,7 +29,9 @@ 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred -1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred diff --git a/test/rejectlog/0548 b/test/rejectlog/0548 index 7bf11268a..0e99d3f7a 100644 --- a/test/rejectlog/0548 +++ b/test/rejectlog/0548 @@ -4,7 +4,9 @@ 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred -1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred +1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F= temporarily rejected RCPT : Recipient deferred diff --git a/test/stderr/0476 b/test/stderr/0476 index a0e57bd4a..b6e954eb0 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -97,9 +97,6 @@ t1 transport entered usery@test.ex checking status of 127.0.0.1 no message retry record -host retry time not reached: checking ultimate address timeout - now=tttt first_failed=tttt next_try=tttt expired=0 - received_time=tttt diff=tttt timeout=86400 127.0.0.1 [127.0.0.1]:1111 status = unusable all IP addresses skipped or deferred at least one address updating wait-t1 database diff --git a/test/stderr/0529 b/test/stderr/0529 index 872b37402..49ca6dcaf 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -69,7 +69,7 @@ After routing: locking TESTSUITE/spool/db/retry.lockfile retry record exists: age=ttt (max 1w) time to retry = tttt expired = 0 -retry time not reached for TESTSUITE/test-mail/rmbox: checking ultimate address timeout +retry time not reached: checking ultimate address timeout now=tttt first_failed=tttt next_try=tttt expired=0 received_time=tttt diff=tttt timeout=259200 LOG: retry_defer MAIN -- 2.30.2