Testsuite: add progress detail to log of troublesome testcase

diff --git a/test/log/0206 b/test/log/0206
index 734c2d969b156a9d7e46d761baf9d488320450c8..b39fb01afe5c9e22e3315946a0683bf1f6b106c9 100644 (file)
--- a/test/log/0206
+++ b/test/log/0206
@@ -1,10 +1,14 @@
+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 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 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
 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


@@ -12,6 +16,8 @@
 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 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
 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


@@ -19,3 +25,4 @@
 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 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 6f9968f9686a8075acb7c3858cdf05d81fbf9169..e54e252603df3039cd73eac3aeb9704409588848 100644 (file)
--- a/test/scripts/0000-Basic/0206
+++ b/test/scripts/0000-Basic/0206
@@ -1,12 +1,26 @@
 # 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
 sleep 1

+exim -z 'freeze 1st spooled msg'
+****

 sudo exim -Mf $msg1
 ****
 sudo exim -Mf $msg1
 ****

+exim -z 'run queue'
+****

 exim -qf
 ****
 exim -qf
 ****

+exim -z 'pause 3'
+****

 sleep 3
 sleep 3

+exim -z 'run queue'
+****

 exim -q
 ****
 exim -q
 ****

+exim -z 'finished'
+****

 no_msglog_check
 no_msglog_check