Final changes

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

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 5d39ab13e2e1c2477b160ebd3907fd3b4a4ee570..9d5e13db1ecb56f10a9f43030d4ef36e96944e34 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -5,51 +5,49 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-rm -f tmp/original
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+scripts/cleanup
+echo "${cwd}/build" >/tmp/file-list
 
 echo " "
 echo " "
 echo " === Starting verify Volume Test ==="
+echo " === Starting verify Volume Test ===" >>working/log
 echo " "
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bacula start 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output
-label
-TestVolume001
-run job=NightlySave
-yes
+@output tmp/log1.out
+label storage=File volume=TestVolume001
+run job=NightlySave yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
+@output ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait
-@tee ${cwd}/tmp/original
 messages
 @output
 quit
 END_OF_DATA
 sleep 2
-bin/bacula stop
-grep "Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
-if [ $? != 0 ] ; then
+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=$?
+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 ===== "
    echo "  ===== Verify Volume Test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
-   rm -f ${cwd}/tmp/original
+   scripts/cleanup
 fi