Final changes

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

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index bc33ebee64927ac1352074f2900de1255407eb9f..aee240cfd4d61c46ba589ea784a668d940fe514e 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -7,9 +7,6 @@ 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 " "
@@ -18,27 +15,29 @@ echo " === Starting two-jobs-test  ===" >>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
+setdebug level=15  storage=File
+@output /dev/null
+messages
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
 messages
 @output tmp/log1.out
-label storage=File
-TestVolume001
-run job=CompressedTest
-yes
+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
 #
 # run a second job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -50,26 +49,30 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore current all
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-restore current all    
+restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 @output tmp/log2.out
-restore 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
 bstat=$?
 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 " "