Update to 1.36.1 output format

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

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index d017fbb16ccf30ae895f25b8c8ea03df93b1ce54..8215a698d35ab43174b27e351090c953af01796c 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -2,15 +2,13 @@
 #
 # Run a simple backup of the Bacula build directory but 
 #   split the archive into four volumes, two of which are
-#   totally full. 
+#   totally full. I.e. make sure that bsr selects all tapes 
+#   including those fully spanned.
 #
 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
 
 echo " "
 echo " "
@@ -19,7 +17,7 @@ echo " === Starting span-vol-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -38,24 +36,35 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build  tmp/bacula-restores${cwd}/build
+diff -r build  tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
    echo "  !!!!! span-vol-test Bacula source failed!!! !!!!! "
    echo "  !!!!! span-vol-test failed!!! !!!!! " >>test.out
+   if [ $bstat != 0 -o $rstat != 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 "  ===== span-vol-test Bacula source OK ===== "