Final changes

[bacula/bacula] / regress / tests / verify-vol-test

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 15caa6559c66789f6cc112fa22505a52a30900cf..35b404406df6b943bf3c55dd02b5e063d8193cf3 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -7,9 +7,6 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
@@ -18,14 +15,13 @@ echo " === Starting verify Volume Test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=File
-TestVolume001
-run job=NightlySave
-yes
+setdebug level=1 storage=File sd
+label storage=File volume=TestVolume001
+run job=NightlySave yes
 wait
 messages
 @# 
@@ -40,6 +36,7 @@ messages
 quit
 END_OF_DATA
 sleep 2
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
@@ -49,6 +46,13 @@ if [ $? != 0 -o $bstat != 0 ] ; then
    echo " "
    echo "  !!!!! Verify Volume failed!!! !!!!! "
    echo "  !!!!! Verify Volume failed!!! !!!!! " >>test.out
+   if [ $bstat != 0 ] ; then
+      echo "  !!!!! Bad Job termination status     !!!!! "
+      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
+   else
+      echo "  !!!!! Restored files differ          !!!!! "
+      echo "  !!!!! Restored files differ          !!!!! " >>test.out
+   fi
    echo " "
 else
    echo "  ===== Verify Volume Test OK ===== "