ebl Tweak the test to use "wait mount" instead of sleep

[bacula/bacula] / regress / tests / runscript-test

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index cd53433e15c1e2c3c175ed0defc5c3990356a430..ef024c21fda163408e96969d647428ca91dd5d71 100755 (executable)
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -24,6 +24,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 label volume=TestVolume001 pool=Scratch
+setdebug dir level=200
 @$out ${cwd}/tmp/RUN_FD_WARNING.log
 run job=RUN_FD_WARNING yes
 wait
@@ -76,7 +77,12 @@ grep 'shell command: run ClientAfterJob "/bin/echo ClientRunAfterJob' ${cwd}/tmp
 c=$?
 grep 'shell command: run AfterJob "/bin/echo RunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
 d=$?
-if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 ]
+grep 'ClientRunBefore1' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null && \
+grep 'ClientRunBefore2' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null && \
+grep 'ClientRunBefore3' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+e=$?
+
+if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_ALL_OK ok
 else
@@ -126,7 +132,9 @@ grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_
 d=$?
 grep  '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
 e=$?
-if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
+grep 'RUN_FD_FAILED4' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+f=$?
+if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 -a $f != 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
 else