Final changes

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

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