X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-concurrent-jobs-test;h=bd7e20f8850448cd6cf32ee351124aba71058e3c;hb=5fe92a377764dd973ff27c0ce9c0bb742d33df71;hp=3929bb51c78d35f94f20f41dadd9067c450a6209;hpb=4348921bc493f224a5f71f881e83259ce8c781c9;p=bacula%2Fbacula

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 3929bb51c7..bd7e20f885 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -2,22 +2,22 @@
 #
 # Run two jobs at the same time
 #
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="four-concurrent-jobs-test"
+JobName=Four-concurrent-jobs
+. scripts/functions
+set_debug 0
+
 scripts/cleanup
+scripts/copy-test-confs
 echo "${cwd}/build" >/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 >tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
+@$out   tmp/log1.out
 label storage=File1
 TestVolume001
 label storage=File1
@@ -25,16 +25,16 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-run job=NightlySave level=Full Storage=File1
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+run job=$JobName level=Full Storage=File1
 yes
 reload
-run job=NightlySave level=Full Storage=File1
+run job=$JobName level=Full Storage=File1
 yes
 reload
 reload
@@ -53,7 +53,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out   tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
@@ -66,24 +66,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