Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0610

diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610
index ff690f63f2d2dee3ce17c27ce09e0fa7a753e373..348de2f130951d57ba09152456752455a6ea971b 100644 (file)
--- a/test/scripts/0000-Basic/0610
+++ b/test/scripts/0000-Basic/0610
@@ -1,10 +1,11 @@
 # retry: transport with fixed interface
 # Exim test configuration 0610
 #
 # 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
 ****
 #
 exim -bs

+HELO test

 MAIL FROM:<t1@dustyshoes.tld>
 RCPT TO:<fred@anotherone.tld>
 DATA
 MAIL FROM:<t1@dustyshoes.tld>
 RCPT TO:<fred@anotherone.tld>
 DATA


@@ -28,6 +29,16 @@ exim -qq
 # Should get two separate retry records.
 dump retry
 #
 # 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
 #
 killdaemon
 no_msglog_check