X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fverify-vol-test;h=2df75d62f815b8669fb8f72a4b85e6b542b0becf;hb=a752597b2a79ba0f2dfb0ec6b6da8403464e092b;hp=036a669f38b82a7a25ab9001b7ee9bff18a858b8;hpb=9d811f3933932212d129feb09b1429316367fb86;p=bacula%2Fbacula

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 036a669f38..2df75d62f8 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -3,52 +3,74 @@
 # Run a simple backup of the Bacula build directory
 #   then verify the catalog.           
 #
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
+
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-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 at `date +%R:%S` ==="
+echo " === Starting verify Volume Test at `date +%R:%S` ===" >>working/log
 echo " "
 
-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
-TestVolume001
-run job=NightlySave
-yes
+@$out tmp/log1.out
+setdebug level=1 storage=File sd
+label storage=File volume=TestVolume001
+run job=NightlySave yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
+@$out ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait
-@tee /tmp/original
 messages
-@output
+@$out
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
+
 sleep 2
-bin/bacula stop
-grep "Termination: *Verify OK" /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
+   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 ===== "
    echo "  ===== Verify Volume Test OK ===== " >>test.out
+   scripts/cleanup
 fi
-rm -rf /tmp/bacula-restores
-rm -f /tmp/original