X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frelabel-tape;h=9ff96c59fab949cb39cce7d39ec3d0877f143268;hb=4d691342d4786448f9e8f0ebf95a958f3169c9d1;hp=d929db335892e6a1380bd17eea643a482905d935;hpb=c8a98b6eba62cb0fc3e79ede47738276ac736504;p=bacula%2Fbacula

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index d929db3358..9ff96c59fa 100755
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -4,7 +4,7 @@
 #   then backup four times, each with incremental then finally restore.
 #   It should require at least 4 different bsrs.
 #
-TestName="relabel-1t1d-tape"
+TestName="relabel-tape"
 JobName=Relabeltape
 . scripts/functions
 
@@ -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
@@ -35,24 +36,24 @@ update volume=TestVolume001
 .
 run job=$JobName level=Full yes
 wait
-unmount storage=DDS-4
-unmount storage=DDS-4
-@#setdebug level=150 storage=DDS-4
+list volumes
+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
 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"
@@ -60,7 +61,9 @@ 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
 wait
@@ -72,7 +75,8 @@ wait
 @# now unmount the tape and start two restores
 @#  at the same time
 @#
-unmount storage=DDS-4
+list volumes
+unmount storage=tape
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 restore where=${cwd}/tmp/bacula-restores select
@@ -80,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