X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Frelabel-tape;h=d929db335892e6a1380bd17eea643a482905d935;hb=5dd06f639b5e883410a3af50727706a3d16e4028;hp=68d14a7301cfee8eb9ad71f5a8cd78806dc4a1ce;hpb=9f585bd39c3ea023793d738ca05cae70af661d24;p=bacula%2Fbacula

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index 68d14a7301..d929db3358 100755
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -4,27 +4,29 @@
 #   then backup four times, each with incremental then finally restore.
 #   It should require at least 4 different bsrs.
 #
-TestName="relabel-tape"
+TestName="relabel-1t1d-tape"
 JobName=Relabeltape
 . scripts/functions
-set_debug 0
+
+require_tape_drive
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
-echo "${cwd}/build" >/tmp/file-list
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=$JobName level=Full yes
 wait
 messages
-add pool=Default
+add pool=Default storage=DDS-4
 0
 TestVolume002
 @# set status to append
@@ -32,14 +34,14 @@ update volume=TestVolume001
 1
 .
 run job=$JobName level=Full yes
-@sleep 20
-unmount
-unmount
+wait
+unmount storage=DDS-4
+unmount storage=DDS-4
 @#setdebug level=150 storage=DDS-4
 purge volume=TestVolume001
-relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default
+relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default storage=DDS-4
 list volumes
-mount
+mount storage=DDS-4
 messages
 wait
 run job=$JobName level=Full yes
@@ -57,7 +59,7 @@ echo "Backup done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
@@ -65,7 +67,7 @@ wait
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 @#
 @# now unmount the tape and start two restores
 @#  at the same time