X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-concurrent-jobs-test;h=5190dfce6df18112f8931c34e17f0652ef17a877;hb=414ee85d83197d4f61499f9542455695fa7da276;hp=3929bb51c78d35f94f20f41dadd9067c450a6209;hpb=bf3fcc4412fad96dd7a6e8067e0f93c5bcc3458f;p=bacula%2Fbacula

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 3929bb51c7..5190dfce6d 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -1,23 +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.
 #
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="four-concurrent-jobs-test"
+JobName=Four-concurrent-jobs
+. scripts/functions
+
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting four-concurrent-jobs-test  ==="
-echo " === Starting four-concurrent-jobs-test  ===" >>working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -25,35 +27,51 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-run job=NightlySave level=Full Storage=File1
+setdebug level=51 Storage=File1
+status storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+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
 @#
-@output tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
@@ -66,24 +84,11 @@ 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
-bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
-rstat=$?
-diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! four-concurrent-jobs-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! four-concurrent-jobs-test failed!!! !!!!! " >>test.out
-   echo " "
-   exit 1
-else
-   echo "  ===== four-concurrent-jobs-test Bacula source OK ===== "
-   echo "  ===== four-concurrent-jobs-test OK ===== " >>test.out
-   scripts/cleanup
-   exit 0
-fi
+run_bacula
+check_for_zombie_jobs storage=File1
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test