X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fbackup-bacula-tape;h=f24979535bc60d5e478d0f066344b2d0116749e1;hb=8b7038c5657b736f6fad53f9c609404cdb39e23d;hp=e4cd2ba5e446403a229a144ab00dd96f9035c909;hpb=0035cb51a290dea154c7b19324fa8aa8a0044150;p=bacula%2Fbacula

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index e4cd2ba5e4..f24979535b 100755
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -3,76 +3,115 @@
 # Run a simple backup of the Bacula build directory 
 #   to a tape then restore it, we do that twice to ensure that
 #   we can correctly append to a tape.
+# We also use the purge and the relabel commands as
+#   well as a pile of status storage commands.
 #
-cwd=`pwd`
-bin/bacula stop  2>&1 >/dev/null
+TestName="backup-bacula-tape"
+JobName=backuptape
+. scripts/functions
+
+require_tape_drive
+
 scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "${cwd}/build" >/tmp/file-list
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
 
-echo " "
-echo " "
-echo " === Starting Bacula tape test ==="
-echo " === Starting Bacula tape test ===" >>working/log
-echo " "
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+change_jobname NightlySave $JobName
+start_test
+
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+# Write out bconsole commands
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
-run job=NightlySave yes
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=200 storage=tape
+label storage=tape volume=TestVolume001 slot=0 pool=Default
+purge volume=TestVolume001
+relabel pool=Default storage=tape oldVolume=TestVolume001 volume=TestVolume002 slot=0
+purge volume=TestVolume002
+relabel pool=Default storage=tape oldVolume=TestVolume002 volume=TestVolume001 slot=0
+run job=$JobName yes
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+@sleep 1
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+@sleep 1
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+@sleep 1
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+@sleep 1
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
+status storage=tape
 wait
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
+list volumes
 messages
-@#
-@# Now do a second backup
-@#
-@output /dev/null
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=tape
+stop_bacula
+
+#
+# Now do a second backup after making a few changes
+#
+touch ${cwd}/build/src/dird/*.c
+echo "test test" > ${cwd}/build/src/dird/xxx
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
-run job=NightlySave yes
+@$out ${cwd}/tmp/log1.out
+list volumes
+run job=$JobName yes
 wait
+list volumes
 messages
 @# 
 @# now do a second restore
 @#
-@output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@$out ${cwd}/tmp/log2.out
+list volumes
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
+list volumes
 messages
-@output
 quit
 END_OF_DATA
-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 "  !!!!! Bacula tape test Bacula source failed!!! !!!!! "
-   echo "  !!!!! Bacula tape test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== Bacula tape test Bacula source OK ===== "
-   echo "  ===== Bacula tape test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bacula
+check_for_zombie_jobs storage=tape
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test