Final changes

[bacula/bacula] / regress / tests / two-jobs-test

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index d32b9befabd1a01e48ad937caf0cd9dee7ff0119..87683624648fdfaed477ac625fae256e7976269c 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -7,18 +7,18 @@ 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 " "
-echo " === Starting two-jobs-test  ==="
-echo " === Starting two-jobs-test  ===" >>working/log
+echo " === Starting two-jobs-test at `date +%R:%S` ==="
+echo " === Starting two-jobs-test at `date +%R:%S` ===" >>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 2>&1 >/dev/null
+setdebug level=15  storage=File
+@output /dev/null
+messages
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
@@ -31,12 +31,13 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 echo "Backup 1 done"
 touch ${cwd}/build/src/dird/*.c
 #
 # run a second job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -48,31 +49,42 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+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
+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 "  !!!!! two-jobs-test Bacula source failed!!! !!!!! "
    echo "  !!!!! two-jobs-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-jobs-test Bacula source OK ===== "