X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fansi-label-tape;h=ad9ab4451547b50fc076683b225744190f75acf1;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=3b88d77a0d29069455d3c66a28b4839a068db3c5;hpb=d01e24b1b668624b8b8f3752eb3e7de75988c3af;p=bacula%2Fbacula

diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape
index 3b88d77a0d..ad9ab44515 100755
--- a/regress/tests/ansi-label-tape
+++ b/regress/tests/ansi-label-tape
@@ -25,17 +25,17 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@#setdebug level=200 storage=DDS-4
-label storage=DDS-4 volume=Vol001 slot=0 pool=Default
+setdebug level=200 storage=tape
+label storage=tape volume=Vol001 slot=0 pool=Default
 purge volume=Vol001
-relabel pool=Default storage=DDS-4 oldVolume=Vol001 volume=Vol002 slot=0
+relabel pool=Default storage=tape oldVolume=Vol001 volume=Vol002 slot=0
 purge volume=Vol002
-relabel pool=Default storage=DDS-4 oldVolume=Vol002 volume=Vol001 slot=0
+relabel pool=Default storage=tape oldVolume=Vol002 volume=Vol001 slot=0
 run job=$JobName yes
-status storage=DDS-4
+status storage=tape
 @sleep 1
 wait
 messages
@@ -43,8 +43,8 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-setdebug level=200 storage=DDS-4
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+setdebug level=200 storage=tape
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 list volumes
@@ -52,7 +52,7 @@ messages
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 #
@@ -66,7 +66,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 list volumes
-@#setdebug level=300 storage=DDS-4
+@#setdebug level=300 storage=tape
 run job=$JobName yes
 wait
 list volumes
@@ -76,17 +76,16 @@ messages
 @#
 @$out ${cwd}/tmp/log2.out
 list volumes
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 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
 stop_bacula
 
 check_two_logs