X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-jobs-test;h=b13a3ddd930e20ecbcdea2a35625640d1eb22ca3;hb=e5ef682130f94d5afa513a28cea931bf55220884;hp=65edb56c2dadcec3d1293080fd1479e16c1444b8;hpb=a06cd2b477978cb7cccba36995e0cbdaf35b8dcc;p=bacula%2Fbacula

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 65edb56c2d..b13a3ddd93 100755
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -4,38 +4,33 @@
 #   then backup four times, each with incremental then finally restore.
 #   It should require at least 4 different bsrs.
 #
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="four-jobs-test"
+JobName=SpanVol
+. scripts/functions
+
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting four-jobs-test  ==="
-echo " === Starting four-jobs-test  ===" >>working/log
-echo " "
+change_jobname CompressedTest $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
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
+estimate job=$JobName listing
+estimate job=$JobName
+estimate job=$JobName
 messages
-@output tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bacula
+check_for_zombie_jobs storage=File
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -44,56 +39,62 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-run job=CompressedTest
-yes
+@$out  ${cwd}/tmp/log1.out
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
-run job=CompressedTest yes
+@output ${cwd}/tmp/log1.out
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
-run job=CompressedTest yes
+@output ${cwd}/tmp/log1.out
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
 echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
@@ -101,7 +102,7 @@ wait
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -112,21 +113,11 @@ messages
 @output
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
-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-jobs-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! four-jobs-test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== four-jobs-test Bacula source OK ===== "
-   echo "  ===== four-jobs-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bconsole
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test