Make out of freespace non-fatal for removable devices -- i.e. behaves like tape

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

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 036a669f38b82a7a25ab9001b7ee9bff18a858b8..3509ea6232b40026778b8b83908c32632db837af 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -1,54 +1,78 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory
 #   then verify the catalog.           
 #
+TestName="verify-vol-test"
+JobName=VerifyVol
+. scripts/functions
+
 cwd=`pwd`
+scripts/cleanup
 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
-
-echo " "
-echo " "
-echo " === Starting verify Volume Test ==="
-echo " "
-
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+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
+
+change_jobname NightlySave $JobName
+start_test
+
+cat <<END_OF_DATA >tmp/bconcmds
 @output /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=$JobName yes
 wait
 messages
 @# 
 @# now do a verify volume
 @#
+@$out ${cwd}/tmp/log2.out
+setdebug level=12 dir
 run job=VerifyVolume
 yes
 wait
-@tee /tmp/original
 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
-grep "Termination: *Verify OK" /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
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+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
-rm -rf /tmp/bacula-restores
-rm -f /tmp/original
+dstat=0
+end_test