X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frunscript-test;h=ef024c21fda163408e96969d647428ca91dd5d71;hb=607d301d1a4c30080d46cc380edf2bb3501899d7;hp=77212621fc5bfd73bda94cf6ddd40f74c09ac687;hpb=de08cf5c2d6f3f31740c5fde841a93e9f463cb96;p=bacula%2Fbacula

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index 77212621fc..ef024c21fd 100755
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -1,90 +1,176 @@
 #!/bin/sh
 #
-#  Test if Bacula can automatically create a Volume label.
+#  Test RunScript
 #
 
 TestName="runscript-test"
+JobName=backup
 
 . scripts/functions
-set_debug 0
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
+rm -f ${cwd}/tmp/RUN*log
+rm -f ${cwd}/tmp/RUN_FD_FAILED
+
+touch ${cwd}/tmp/log1.out
 /bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build/po" >${cwd}/tmp/file-list
 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-label volume=TestVolume001
-@#setdebug level=100 storage=File
-@output tmp/log.RUN2.out
+label volume=TestVolume001 pool=Scratch
+setdebug dir level=200
+@$out ${cwd}/tmp/RUN_FD_WARNING.log
 run job=RUN_FD_WARNING yes
 wait
-@sleep 5
 messages
+@sleep 1
+@$out ${cwd}/tmp/RUN_ALL_OK.log
 run job=RUN_ALL_OK yes
 wait
-@sleep 5
 messages
+@sleep 1
+@$out ${cwd}/tmp/RUN_FD_FAILED.log
 run job=RUN_FD_FAILED yes
 wait
-@sleep 5
 messages
+@sleep 1
+@$out ${cwd}/tmp/RUN_DIR_FAILED.log
 run job=RUN_DIR_FAILED yes
 wait
-@sleep 5
+messages
+@sleep 1
+@$out ${cwd}/tmp/RUN_FD_FAILED2.log
+run job=RUN_FD_FAILED2 yes
+wait
+messages
+@sleep 1
+@$out ${cwd}/tmp/RUN_RESTO.log
+restore where=${cwd}/tmp/bacula-restores select all done yes
+wait
 messages
 st dir
 quit
 END_OF_DATA
 
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
 
-bin/bacula start
-cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf &> tmp/log.RUN1.out
+dstat=0
+bstat=0
+rstat=0
+export dstat
+export bstat
+export rstat
 
-stop_bacula
+grep 'shell command: run BeforeJob "/bin/echo RunBeforeJob"' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+a=$?
+grep 'ClientRunBeforeJob: ClientRunBeforeJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+b=$?
+grep 'shell command: run ClientAfterJob "/bin/echo ClientRunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+c=$?
+grep 'shell command: run AfterJob "/bin/echo RunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+d=$?
+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 grep -q 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"'          tmp/log.RUN1.out   &&
-   grep -q 'fd: ClientRunBeforeJob: ClientRunBeforeJob'                    tmp/log.RUN1.out   &&
-   grep -q 'fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob'  tmp/log.RUN1.out   &&
-   grep -q 'dir: AfterJob: run command "/bin/echo RunAfterJob'             tmp/log.RUN1.out
+if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
 then
-   [ "$debug" -eq 1 ] && echo RUN_ALL_OK ok
+   [ "$debug" = 1 ] && echo RUN_ALL_OK ok
 else
    echo "RUN_ALL_OK in error"
-   rstat=1
+   bstat=1
 fi
 
-if grep -q 'dir: BeforeJob: run command "/bin/false RUN_DIR_FAILED"' tmp/log.RUN1.out   &&
-   grep -q 'dir: BeforeJob: RunAfterFailedJob'                       tmp/log.RUN1.out   &&
-   true # grep -q 'Backup OK -- with warnings'                       tmp/log.RUN1.out
+grep 'shell command: run BeforeJob "/bin/false RUN_DIR_FAILED"' ${cwd}/tmp/RUN_DIR_FAILED.log >/dev/null
+a=$?
+grep 'AfterJob: RunAfterFailedJob' ${cwd}/tmp/RUN_DIR_FAILED.log >/dev/null
+b=$?
+if [ $a = 0 -a $b = 0 ]
 then
-   [ "$debug" -eq 1 ] && echo RUN_DIR_FAILED ok
+   [ "$debug" = 1 ] && echo RUN_DIR_FAILED ok
 else
    echo "RUN_DIR_FAILED in error"
-   rstat=1
+   bstat=1
 fi
 
-if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"'  tmp/log.RUN1.out   &&
-   grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"'  tmp/log.RUN1.out   &&
-   grep -q 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"'      tmp/log.RUN1.out
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+a=$?
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+b=$?
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED3"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+c=$?
+grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+d=$?
+grep 'touching' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+e=$?
+grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null
+f=$?
+if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 -a $f = 0 ]
 then
-   [ "$debug" -eq 1 ] && echo RUN_FD_FAILED ok
+   [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
 else
-   echo "RUN_FD_FAILED in error"
-   rstat=1
+   echo "RUN_FD_FAILED in error a=$a b=$b c=$c d=$d e=$e f=$f"
+   bstat=1
 fi
 
-if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"' tmp/log.RUN1.out   &&
-   grep -q 'Backup OK -- with warnings'                                   tmp/log.RUN1.out
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+a=$?
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+b=$?
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED3"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+c=$?
+grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+d=$?
+grep  '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+e=$?
+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" -eq 1 ] && echo RUN_FD_WARNING ok
+   [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
+else
+   echo "RUN_FD_FAILED2 in error a=$a b=$b c=$d d=$d e=$e"
+   bstat=1
+fi
+
+grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_WARNING"' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null
+a=$?
+grep 'RunAfterFailedJob' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null
+b=$?
+grep 'Backup OK -- with warnings' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null
+c=$?
+if [ $a = 0 -a $b != 0 -a $c = 0 ]
+then
+   [ "$debug" = 1 ] && echo RUN_FD_WARNING ok
 else
    echo "RUN_FD_WARNING in error"
+   bstat=1
+fi
+
+grep 'ClientBeforeRestore' ${cwd}/tmp/RUN_RESTO.log >/dev/null
+a=$?
+grep 'ClientAfterRestore' ${cwd}/tmp/RUN_RESTO.log >/dev/null
+b=$?
+grep 'DirBeforeRestore' ${cwd}/tmp/RUN_RESTO.log >/dev/null
+c=$?
+grep 'DirAfterRestore' ${cwd}/tmp/RUN_RESTO.log >/dev/null
+d=$?
+if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 ]
+then
+   [ "$debug" = 1 ] && echo RUN_RESTO ok
+else
+   echo "RUN_RESTO in error"
    rstat=1
 fi
 
+
+end_test