X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fverify-vol-test;h=36368e5dac899deeef4d26f943ca1627e5772392;hb=681b5e76d9ffd71e5333955d9b3415ded2da5215;hp=7f4913b93ea308a305918e505e4f788083a4cb94;hpb=bd1975d9d3da8162240c6e2895d1a97a209c7c92;p=bacula%2Fbacula

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 7f4913b93e..36368e5dac 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -3,56 +3,71 @@
 # 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
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
+rm -f ${cwd}/build/sparsefile
+#
+# Add this back when verify can handle sparse files
+#  the same way that backup does
+#
+#dd if=${cwd}/build/configure of=${cwd}/build/sparsefile bs=1 count=1 seek=10M
 
-echo " "
-echo " "
-echo " === Starting verify Volume Test ==="
-echo " === Starting verify Volume Test ===" >>working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
+setdebug level=1 storage=File sd
 label storage=File volume=TestVolume001
-run job=NightlySave yes
+run job=$JobName yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
-@output ${cwd}/tmp/original
+@$out ${cwd}/tmp/log2.out
+setdebug level=12 dir
 run job=VerifyVolume
 yes
 wait
 messages
-@output
+@$out ${cwd}/tmp/log3.out
+run job=VerifyVolume level=DiskToCatalog
+yes
+wait
+messages
 quit
 END_OF_DATA
+
+#
+#  ***FIXME***
+# Note, add sparse file backup and check that checksum is
+#  correct.  Bug #1140
+#  create sparse file
+#  dd if=/dev/zero of=sparsefile bs=1 count=0 seek=10M
+#
+
+run_bacula
+
 sleep 2
-bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+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
-if [ $? != 0 -o $bstat != 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
+grep "^  Termination: *Verify OK" tmp/log2.out 2>&1 >/dev/null
+rstat=$?
+if test $rstat=0; then
+   grep "^  Termination: *Verify OK" tmp/log3.out 2>&1 >/dev/null
+   rstat=$?
 fi
+dstat=0
+end_test