Testsuite: extend retry-records testcase to check removal

4 files changed, 27 insertions, 4 deletions

diff --git a/test/confs/0610 b/test/confs/0610
index 5ce2723ae..370391b95 100644
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -21,7 +21,9 @@ queue_run_in_order
 begin acl
 
 conn_chk:
+.ifdef DELAY
   defer	condition = ${if eq {SERVER}{server}}
+.endif
   accept
 
 # ----- Routers -----
@@ -62,7 +64,7 @@ t2:
 
 begin retry
 
-* * F,5d,10s
+* * F,5d,1s
 
 # End
 
diff --git a/test/log/0610 b/test/log/0610
index d741a86a9..63303e891 100644
--- a/test/log/0610
+++ b/test/log/0610
@@ -6,8 +6,17 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaY-0005vi-00 == fred@anotherone.tld R=r2 T=t2 defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
+1999-03-02 09:44:33 Start queue run: pid=pppp -qq
+1999-03-02 09:44:33 10HmaX-0005vi-00 => fred@anotherone.tld F=<t1@dustyshoes.tld> R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => fred@anotherone.tld F=<t2@dustybelt.tld> R=r2 T=t2 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qq
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL
 1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] temporarily rejected connection in "connect" ACL
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= t1@dustyshoes.tld H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= t2@dustybelt.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610
index 758e7fb43..348de2f13 100644
--- a/test/scripts/0000-Basic/0610
+++ b/test/scripts/0000-Basic/0610
@@ -1,7 +1,7 @@
 # retry: transport with fixed interface
 # Exim test configuration 0610
 #
-exim -DSERVER=server -bd -oX PORT_D
+exim -DSERVER=server -DDELAY=y -bd -oX PORT_D
 ****
 #
 exim -bs
@@ -29,6 +29,16 @@ exim -qq
 # Should get two separate retry records.
 dump retry
 #
+# Arrange final delivery of both; retry records should be removed.
+killdaemon
+sleep 1
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim -qq
+****
+dump retry
+# just so the output is hard to misread
+dump retry
 #
 killdaemon
 no_msglog_check
diff --git a/test/stdout/0610 b/test/stdout/0610
index 6b1d7a710..b0c31adbd 100644
--- a/test/stdout/0610
+++ b/test/stdout/0610
@@ -12,6 +12,8 @@
 221 the.local.host.name closing connection

 +++++++++++++++++++++++++++
   T:127.0.0.1:127.0.0.1:1225/127.0.0.1 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later
-first failed = time last try = time2 next try = time2 + 10
+first failed = time last try = time2 next try = time2 + 2
   T:127.0.0.1:127.0.0.1:1225/ip4.ip4.ip4.ip4 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later
-first failed = time last try = time2 next try = time2 + 10
+first failed = time last try = time2 next try = time2 + 2
++++++++++++++++++++++++++++
++++++++++++++++++++++++++++