DMARC: expand main-config options. Bug 3102

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

diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206
index e54e252603df3039cd73eac3aeb9704409588848..2739f29e1888954fd1864f07e53db4601af4da68 100644 (file)
--- a/test/scripts/0000-Basic/0206
+++ b/test/scripts/0000-Basic/0206
@@ -1,26 +1,16 @@
 # timeout_frozen_after with ignore_bounce_errors_after
 # 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
 ****
 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
 ****
 sudo exim -Mf $msg1
 ****

-exim -z 'run queue'
-****
-exim -qf
-****
-exim -z 'pause 3'
-****
-sleep 3
-exim -z 'run queue'
-****
-exim -q
+# now 2 frozen, one of which is a bounce
+# check that ignore_bounce_errors_after finishes off the frozen bounce (only)
+#sleep 5
+exim -Tqt 5s/5s/ -qf

 ****
 ****

-exim -z 'finished'
+#sleep 6
+# check that timeout_frozen_after finishes off the (remaining) frozen
+exim -Tqt 11s/11s -q

 ****
 no_msglog_check
 ****
 no_msglog_check