Merge branch 'master' into basejobv3

[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 b55a441f26d305422293e23468704fa3cd02b868..8d93599352d1b0b4aae27da397af6bf238ceb44d 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -11,15 +11,15 @@ JobName=Four-concurrent-jobs
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -27,61 +27,78 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=File1
+setdebug level=51 Storage=File1
 status storage=File1
 llist volume=TestVolume001
 llist volume=TestVolume002
+list nextvol
+1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
+list nextvol
+1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
+list nextvol
+1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
+list nextvol
+1
 status storage=File1
 run job=$JobName level=Full Storage=File1
 yes
 status storage=File1
-reload
-reload
-reload
-reload
+@#reload
+@#reload
+list nextvol
+1
 @sleep 2
 status dir
 status storage=File1
 llist volume=TestVolume001
 llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
 messages
-reload
-reload
+@#reload
 wait
 status storage=File1
-reload
+@#reload
+list nextvol
+1
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out ${cwd}/tmp/jobmedia.out
+list volumes
+sql
+select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia;
+
+
+@$out   ${cwd}/tmp/log2.out
+status storage=File1
+setdebug level=100 Storage=File1
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
 done
 yes
 wait
-reload
-reload
+run job=$JobName level=Full Storage=File1 yes
+wait
+@#reload
 messages
-@output
 quit
 END_OF_DATA