X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsix-vol-test;h=3bc11d26077c7e877e496bf0b610b08764836418;hb=ade07b7afd278f819fbef347bd643c3328de54cb;hp=61e6dff9efd4c4bd41ea20dff63e12f16b6f9bdb;hpb=c4d3e4a4f6af72c0003ca8b062b6085bc4987d45;p=bacula%2Fbacula

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 61e6dff9ef..3bc11d2607 100755
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -3,38 +3,51 @@
 # Create a 60MB file with random bytes. Back it up to 6 Volumes
 #   each constrained to 10MB using the automatic labeling feature.
 #
+TestName="six-vol-test"
+JobName=SixVol
+. scripts/functions
 
 if test ! -c /dev/urandom ; then
    echo "No random device. Test skipped.\n"
    exit 0
 fi
-cwd=`pwd`
-scripts/copy-testa-confs
+
 scripts/cleanup
-echo "${cwd}/tmp/largefile" >/tmp/file-list
+scripts/copy-testa-confs
+# copy special conf file
+/bin/cp -f scripts/testb-bacula-dir.conf bin/bacula-dir.conf
+
+echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 # Create 56MB file with random data
 echo "Creating a 56MB file with random data ..."
-dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
+dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 >/dev/null 2>&1
 echo "largefile created"
 
-echo " "
-echo " "
-echo " === Starting six-vol-test  ==="
-echo " === Starting six-vol-test  ===" >>working/log
-echo " "
+change_jobname MultiVol $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-run job=MultiVol storage=File yes
+@$out ${cwd}/tmp/log1.out
+setdebug level=150 storage=File
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
 wait
+list volumes
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+sql
+select * from JobMedia where JobId=4;
+select * from JobMedia where JobId=5;
+
+setdebug level=150 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -42,24 +55,14 @@ done
 yes
 wait
 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 tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! six-vol-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! six-vol-test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== six-vol-test Bacula source OK ===== "
-   echo "  ===== six-vol-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+dstat=$?
+end_test