X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-volume-tape;h=e20af2510caff16bc9ecc1dae7810b34aff4658d;hb=795d9320e7918c0048252c84ea27ba843337bbd6;hp=a9bedc5a74ec8ede9135e249aff06b1ee87d0f8f;hpb=81c5a9180e197effe35760b6e0364bafd1af6bed;p=bacula%2Fbacula

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index a9bedc5a74..e20af2510c 100755
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -5,39 +5,63 @@
 #  Note, this test simulates the tape filling and writing to
 #   the next tape.
 #
-debug=0
-if test "$debug" -eq 1 ; then
-  out="tee"
-else
-  out="output"
+TestName="two-volume-tape"
+JobName=twovoltape
+. scripts/functions
+
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "${TestName} test skipped. No autochanger."
+   exit
 fi
-cwd=`pwd`
+
 scripts/cleanup
 scripts/copy-2tape-confs
 scripts/prepare-two-tapes
  
-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 Tape test at `date +%R:%S` ==="
-echo " === Starting Two Volume Tape test at `date +%R:%S` ===" >>working/log
-echo " "
+change_jobname $JobName
+start_test
+
 # Write out bconsole commands
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default
-update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default
-run job=NightlySave yes
+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,Slot,StorageId from Media;
+
+@#setdebug level=1000 client 
+@#setdebug level=250 storage=DDS-4
+run job=$JobName yes
 wait
+sql
+select * from Storage;
+select VolumeName,InChanger,Slot,StorageId from Media;
+
+messages
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+mt -f ${TAPE_DRIVE} rewind
+mtx -f ${AUTOCHANGER} unload
+sleep 15
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
 @# 
 @# now do a restore
@@ -51,29 +75,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 Tape test Bacula source failed!!! !!!!! "
-   echo "  !!!!! Two Volume Tape test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== Two Volume Tape test Bacula source OK ===== "
-   echo "  ===== Two Volume Tape test OK ===== " >>test.out
-#  scripts/cleanup
-fi
+check_two_logs
+check_restore_diff
+end_test