X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-volume-test;h=1266e75d76c84605555cf775d4c28a6cd2e35751;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=dd756657159742b50e4a5e213bd9ffa0ca2d6e90;hpb=99315e9010cc655fd57346986dc4dc807838eecf;p=bacula%2Fbacula

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index dd75665715..1266e75d76 100755
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -5,36 +5,27 @@
 #  Note, this test simulates the tape filling and writing to
 #   the next tape.
 #
-#  Note we used the viritual disk autochanger
+#  Note we use the viritual disk autochanger
 #
-. config.out
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "two-volume-test skipped. No autochanger."
-   exit
-fi
-debug=0
-if test "$debug" -eq 1 ; then
-  out="tee"
-else
-  out="output"
-fi
+TestName="two-volume-test"
+JobName=TwoVolume
+. scripts/functions
+
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
  
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 outf="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-echo " "
-echo " "
-echo " === Starting Two Volume Test at `date +%R:%S` ==="
-echo " === Starting Two Volume Test at `date +%R:%S` ===" >>working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
+
 # Write out bconsole commands
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -43,9 +34,18 @@ messages
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
 update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0
+sql                               
+select * from Storage;
+select VolumeName,InChanger,StorageId from Media;
+
 @#setdebug level=1000 client 
-run job=NightlySave yes
+run job=$JobName yes
 wait
+update slots scan storage=DDS-4
+sql                               
+select * from Storage;
+select VolumeName,InChanger,StorageId from Media;
+
 messages
 @# 
 @# now do a restore
@@ -59,29 +59,10 @@ messages
 quit
 END_OF_DATA
 
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
-scripts/check_for_zombie_jobs storage=DDS-4
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
 
-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 "  !!!!! Two Volume Test Bacula source failed!!! !!!!! "
-   echo "  !!!!! Two Volume Test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== Two Volume Test Bacula source OK ===== "
-   echo "  ===== Two Volume Test OK ===== " >>test.out
-#  scripts/cleanup
-fi
+check_two_logs
+check_restore_diff
+end_test