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.

diff --git a/test/log/0548 b/test/log/0548
index 2c2718c572ebd997ae7b6bb2f1047e07f774b12c..cc614394ab3067eea81ef9e89cb292a4c7f293f5 100644 (file)
--- 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 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:<userx@test.ex>: 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:<usery@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient 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:<usery@test.ex>: 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:<usery@test.ex>: 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 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:<userx@test.ex>: 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:<usery@test.ex>: 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 RCPT TO:<usery@test.ex>: 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:<usery@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred

 1999-03-02 09:44:33 End queue run: pid=pppp
 
 ******** SERVER ********
 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=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=[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=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred
+1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred

+1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=[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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred

diff --git a/test/rejectlog/0548 b/test/rejectlog/0548
index 7bf11268af062fd5230e3f25e8395d9102f772a2..0e99d3f7a168effad345901c5e81c79941dc2195 100644 (file)
--- 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=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=[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=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred
+1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: 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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred

+1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: 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=[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=<CALLER@test.ex> temporarily rejected RCPT <usery@test.ex>: Recipient deferred

diff --git a/test/stderr/0476 b/test/stderr/0476
index a0e57bd4a6ee29b08ec699f33ba5fe2c7a842e83..b6e954eb05994b23209ffc0f4a04f3591a128a63 100644 (file)
--- 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
   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
 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 872b37402f248ee0ea9f831b6e387a9a90172a6f..49ca6dcaf5aa6ff9ab7f6da956afd4acc45758d1 100644 (file)
--- 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
 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
   now=tttt first_failed=tttt next_try=tttt expired=0
   received_time=tttt diff=tttt timeout=259200
 LOG: retry_defer MAIN