X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-jobs-test;h=4f1fdabdcd1ff7f50bcd8b039304cf1682308201;hb=7e44ec3c3206e286f4a549ab17904a10774f8716;hp=e2671141b1ae71bdb5930d46827068bce6208fc0;hpb=c37d94ac16c7b3c019e2b665c45c9141943987e0;p=bacula%2Fbacula

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index e2671141b1..4f1fdabdcd 100755
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -3,64 +3,77 @@
 # 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/cleanup
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting two-jobs-test  ==="
-echo " "
+change_jobname CompressedTest $JobName
+start_test
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+cat >tmp/bconcmds <<END_OF_DATA
+setdebug level=15  storage=File
 @output /dev/null
 messages
-label storage=File
-TestVolume001
-run job=CompressedTest
-yes
+@output/dev/null
+estimate job=$JobName listing
+estimate job=$JobName listing
+estimate job=$JobName listing
+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
-run job=CompressedTest
+cat >tmp/bconcmds <<END_OF_DATA
+@output /dev/null
+messages
+@$out tmp/log1.out
+run job=$JobName
 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
+@$out 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
-   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
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
-fi
+
+run_bconsole
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test