X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-jobs-test;h=b8f8e8f87fc80f7b3175c11acf5e7d894fbe81be;hb=607d301d1a4c30080d46cc380edf2bb3501899d7;hp=136aa4ea72147ff5e9954fd7f38cf1b8ff5e7dcf;hpb=ef7af4293ec8505da39719d8558fdc57f90cce2e;p=bacula%2Fbacula

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 136aa4ea72..b8f8e8f87f 100755
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -3,52 +3,65 @@
 # Run a simple backup of the Bacula build directory using the compressed option
 #   then backup a second time and finally restore it
 #
+TestName="two-jobs-test"
+JobName=Two-Jobs
+. scripts/functions
+
 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
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting two-jobs-test  ==="
-echo " === Starting two-jobs-test  ===" >>working/log
-echo " "
+change_jobname CompressedTest $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+cat >tmp/bconcmds <<END_OF_DATA
+setdebug level=150  storage=File
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File
-TestVolume001
-run job=CompressedTest
-yes
+@output/dev/null
+estimate job=$JobName listing
+estimate job=$JobName
+estimate job=$JobName
+messages
+@$out tmp/log1.out
+label storage=File volume=TestVolume001
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
+
+run_bacula
+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
+cat >tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
-run job=CompressedTest
+@$out tmp/log1.out
+run job=$JobName
 yes
 wait
 messages
 @# 
-@# now do a restore
+@# now do several restores to ensure we cleanup between jobs
 @#
-@output tmp/log2.out
-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
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 yes
 wait
@@ -56,20 +69,11 @@ messages
 @output
 quit
 END_OF_DATA
-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
-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 " "
-else
-   echo "  ===== two-jobs-test Bacula source OK ===== "
-   echo "  ===== two-jobs-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bconsole
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test