X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-vol-test;h=876b8fa011aec0ce43fd1b056aea12bc2b1dfb23;hb=7f2d4342af6f630a86e12a6ca63b2a497fdf5a1e;hp=2192c86dae3b420dbb8031bd188fe51891d02aaa;hpb=18719fef8bb3ba6c760593f74e63d58ebda77d02;p=bacula%2Fbacula

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 2192c86dae..876b8fa011 100755
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -3,57 +3,76 @@
 # Run a simple backup of the Bacula build directory but 
 #   split the archive into two volumes
 #
+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/TestVolume002 tmp/bacula-restores
+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 " "
-echo " === Starting two-vol-test  ==="
+echo " === Starting two-vol-test at `date +%R:%S` ==="
+echo " === Starting two-vol-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
-label storage=File1
-TestVolume001
-label storage=File1
-TestVolume002
-update Volume=TestVolume001
-6
-3000000
-10
-@output
-run job=NightlySave storage=File1
-yes
+@$out tmp/log1.out
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume001
+update Volume=TestVolume002 MaxVolBytes=3000000
+run job=NightlySave storage=File1 yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores
-5
-done
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages
+@$out
 quit
 END_OF_DATA
-bin/bacula stop
-diff -ur build  tmp/bacula-restores${cwd}/build
-if [ $? != 0 ] ; then
+
+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
+
+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
+bstat=$?
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+rstat=$?
+diff -r build  tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== two-vol-test Bacula source failed!!! ===== "
-   echo "  ===== two-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! two-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! two-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 "  ===== two-vol-test Bacula source OK ===== "
    echo "  ===== two-vol-test OK ===== " >>test.out
-   rm -rf tmp/bacula-restores tmp/TestVolume001 tmp/TestVolume002
+   scripts/cleanup
 fi