summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-08-19 15:52:18 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2016-08-19 15:52:18 +0100
commit936bbfed7b58ab84ad892cf9872b8056f44f13bf (patch)
tree4aed66c7cae909d5d84b04f1030dd9bcdec35afd
parente3b1f624c34b1345747184f4aa7bb9aca375600b (diff)
Testsuite: rework timing of time-dependent testcase
-rw-r--r--test/log/02067
-rw-r--r--test/scripts/0000-Basic/020620
2 files changed, 5 insertions, 22 deletions
diff --git a/test/log/0206 b/test/log/0206
index b39fb01af..734c2d969 100644
--- a/test/log/0206
+++ b/test/log/0206
@@ -1,14 +1,10 @@
-1999-03-02 09:44:33 fire in 2-rcpt message
1999-03-02 09:44:33 10HmaX-0005vi-00 <= unknown@test.ex U=root P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 == freeze@test.ex R=freeze defer (-17): error in redirect data: missing or malformed local part (expected word or "<") in "bad address"
1999-03-02 09:44:33 10HmaX-0005vi-00 ** nonexist@test.ex: Unrouteable address
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 ** unknown@test.ex: Unrouteable address
1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
-1999-03-02 09:44:33 pause 1
-1999-03-02 09:44:33 freeze 1st spooled msg
1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by root
-1999-03-02 09:44:33 run queue
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 Message is frozen
1999-03-02 09:44:33 10HmaY-0005vi-00 Unfrozen by errmsg timer
@@ -16,8 +12,6 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 unknown@test.ex: error ignored
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 pause 3
-1999-03-02 09:44:33 run queue
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by timeout_frozen_after
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -25,4 +19,3 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 finished
diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206
index e54e25260..64afd8014 100644
--- a/test/scripts/0000-Basic/0206
+++ b/test/scripts/0000-Basic/0206
@@ -1,26 +1,16 @@
# timeout_frozen_after with ignore_bounce_errors_after
-exim -z 'fire in 2-rcpt message'
-****
sudo exim -odi -f unknown@test.ex nonexist@test.ex freeze@test.ex
****
-exim -z 'pause 1'
-****
-sleep 1
-exim -z 'freeze 1st spooled msg'
-****
+# that gave us a frozen bounce, and a deferred message (with one undelivered addr)
sudo exim -Mf $msg1
****
-exim -z 'run queue'
-****
+# now 2 frozen, one of which is a bounce
+# check that ignore_bounce_errors_after finishes off the frozen bounce (only)
+millisleep 2500
exim -qf
****
-exim -z 'pause 3'
-****
sleep 3
-exim -z 'run queue'
-****
+# check that timeout_frozen_after finishes off the (remaining) frozen
exim -q
****
-exim -z 'finished'
-****
no_msglog_check