update speed-test

[bacula/bacula] / regress / tests / relabel-tape

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index f3406811261e753e312fe478ace9d31cc52a1690..9ff96c59fab949cb39cce7d39ec3d0877f143268 100755 (executable)
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -19,14 +19,15 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
+setdebug level=150 storage=tape
+label storage=tape volume=TestVolume001 slot=0 pool=Default
 run job=$JobName level=Full yes
 wait
 messages
-add pool=Default storage=DDS-4
+add pool=Default storage=tape
 0
 TestVolume002
 @# set status to append
@@ -36,26 +37,23 @@ update volume=TestVolume001
 run job=$JobName level=Full yes
 wait
 list volumes
-unmount storage=DDS-4
-unmount storage=DDS-4
-setdebug level=150 storage=DDS-4
+unmount storage=tape
+unmount storage=tape
 purge volume=TestVolume001
-relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default storage=DDS-4
+relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default storage=tape
 list volumes
-mount storage=DDS-4
+mount storage=tape
 messages
 wait
-setdebug level=0 storage=DDS-4
 run job=$JobName level=Full yes
 wait
 list volumes
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 
 
 echo "Backup done"
@@ -63,7 +61,8 @@ echo "Backup done"
 # now do several restores to ensure we cleanup between jobs
 #
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@$out ${cwd}/tmp/log2.out
+setdebug level=150 storage=tape
 list volumes
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
@@ -77,8 +76,7 @@ wait
 @#  at the same time
 @#
 list volumes
-setdebug level=150 storage=DDS-4
-unmount storage=DDS-4
+unmount storage=tape
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 restore where=${cwd}/tmp/bacula-restores select
@@ -86,16 +84,15 @@ unmark *
 mark *
 done
 yes
-mount storage=DDS-4
+mount storage=tape
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bconsole
 
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs