X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-concurrent-jobs-test;h=80a3fcc691895006f95bb081107346565435145d;hb=5d5be3b52427fbfe3fbefbca0193f4cf32af74f5;hp=95e88a16b2daa735342627ff49c614c40617fd0c;hpb=5b4f40e5baaa8cbba795741f60488e464fddea1e;p=bacula%2Fbacula

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 95e88a16b2..80a3fcc691 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -1,24 +1,25 @@
 #!/bin/sh
 #
-# Run two jobs at the same time
+# Run four jobs at the same time, with two Volumes.
+#   Set max Vol bytes of first volume
+#   to less than total backup to force Bacula to use the second
+#   Volume.
 #
 TestName="four-concurrent-jobs-test"
 JobName=Four-concurrent-jobs
 . scripts/functions
-set_debug 0
 
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-
-change_jobname $JobName
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
+change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -26,40 +27,57 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
+setdebug level=51 Storage=File1
+status storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
+llist volume=TestVolume001
+llist volume=TestVolume002
+status storage=File1
 run job=$JobName level=Full Storage=File1
 yes
+status storage=File1
 reload
 reload
 reload
 reload
 @sleep 2
 status dir
+status storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
 reload
 @sleep 5
 messages
 reload
 reload
 wait
+status storage=File1
 reload
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
 done
 yes
+run job=$JobName level=Full Storage=File1 yes
 wait
 reload
 reload