Before done change

[bacula/bacula] / regress / tests / four-concurrent-jobs-test

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 8231cc54afd21942c6127135316c609625e35173..fbcf54798d537e96d1eafa30824f67d002e4e259 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -7,8 +7,11 @@ 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
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "
@@ -16,8 +19,7 @@ echo " === Starting four-concurrent-jobs-test  ==="
 echo " === Starting four-concurrent-jobs-test  ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -26,11 +28,9 @@ label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001
-6
-100000000
+update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
-10
+12
 run job=NightlySave level=Full Storage=File1
 yes
 run job=NightlySave level=Full Storage=File1
@@ -49,8 +49,9 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-5
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
 done
 yes
 wait
@@ -58,6 +59,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null