X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fverify-vol-test;h=88e875ac662fffb7d48d61d9b004d3410e22efdd;hb=50ec9f3740f3d36fa77f2cecb5f28efc06061ce7;hp=a39ba27b13024b76133d0853bc8a557c0569ae94;hpb=bc9bcb7ab6bf9f2f343a920dced350713a0cf4aa;p=bacula%2Fbacula

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index a39ba27b13..88e875ac66 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -3,53 +3,49 @@
 # Run a simple backup of the Bacula build directory
 #   then verify the catalog.           
 #
+TestName="verify-vol-test"
+JobName=VerifyVol
+. scripts/functions
+
 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
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting verify Volume Test ==="
-echo " === Starting verify Volume Test ===" >>working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
-@output /dev/null
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output
-label storage=File
-TestVolume001
-run job=NightlySave
-yes
+@$out tmp/log1.out
+setdebug level=1 storage=File sd
+label storage=File volume=TestVolume001
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
+@$out ${cwd}/tmp/original
+setdebug level=12 dir
 run job=VerifyVolume
 yes
 wait
-@tee ${cwd}/tmp/original
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+run_bacula
+
 sleep 2
-bin/bacula stop
-grep "Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
-if [ $? != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  ===== Verify Volume failed!!! ===== "
-   echo "  ===== Verify Volume failed!!! ===== " >>test.out
-   echo " "
-else
-   echo "  ===== Verify Volume Test OK ===== "
-   echo "  ===== Verify Volume Test OK ===== " >>test.out
-   scripts/cleanup
-fi
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^  Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
+rstat=$?
+dstat=0
+end_test