X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=regress%2Ftests%2Frelabel-tape;h=ac5a8e6db4f3e5d8a269abcd486f3760319b1a11;hb=7a16fb35362deb87447ecc537b71a7e9768aee50;hp=2650dd0265a049cf2de86985f05e6c0fe7c519b9;hpb=36876f25377b78568edfe63c1d173814d71def6d;p=bacula%2Fbacula

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index 2650dd0265..ac5a8e6db4 100755
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -8,17 +8,21 @@ TestName="relabel-tape"
 JobName=Relabeltape
 . scripts/functions
 
+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
+setdebug level=150 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=$JobName level=Full yes
 wait
@@ -31,10 +35,10 @@ update volume=TestVolume001
 1
 .
 run job=$JobName level=Full yes
-@sleep 20
+wait
+list volumes
 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 storage=DDS-4
 list volumes
@@ -43,6 +47,7 @@ messages
 wait
 run job=$JobName level=Full yes
 wait
+list volumes
 messages
 @$out
 quit
@@ -56,19 +61,22 @@ echo "Backup done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out ${cwd}/tmp/log2.out
+setdebug level=150 storage=DDS-4
+list volumes
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 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
 @#
+list volumes
 unmount storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select all done
 yes