Final changes

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

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index d6bd8e8348fa04080557f511dd6ff4123fea6ad7..9d5e13db1ecb56f10a9f43030d4ef36e96944e34 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,12 @@ 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
+label storage=File volume=TestVolume001
+run job=NightlySave yes
 wait
 messages
 @# 
@@ -40,6 +35,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=$?
@@ -47,8 +43,8 @@ grep "^Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== Verify Volume failed!!! ===== "
-   echo "  ===== Verify Volume failed!!! ===== " >>test.out
+   echo "  !!!!! Verify Volume failed!!! !!!!! "
+   echo "  !!!!! Verify Volume failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== Verify Volume Test OK ===== "