X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmanual-two-vol-tape;h=9d7d52dbaf3dfa6ddfdac6dd3e8d3e3d0a682c4f;hb=d31853cb561b4c9bc779cdc071d904d887a3393c;hp=3dbcaaeaa336f6b77e06077cb93e52f43bcbf7cc;hpb=b451295c0388a35118a148efdbfeea4748a0df57;p=bacula%2Fbacula

diff --git a/regress/tests/manual-two-vol-tape b/regress/tests/manual-two-vol-tape
index 3dbcaaeaa3..9d7d52dbaf 100755
--- a/regress/tests/manual-two-vol-tape
+++ b/regress/tests/manual-two-vol-tape
@@ -42,8 +42,8 @@ cat <<END_OF_DATA >tmp/bconcmds
 @out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume002 slot=0 pool=Default drive=0
-unmount storage=DDS-4
+label storage=tape volume=TestVolume002 slot=0 pool=Default drive=0
+unmount storage=tape
 quit
 END_OF_DATA
 
@@ -56,19 +56,19 @@ init_drive ${TAPE_DRIVE}
 # label first volume, and run first half of job
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0
 update Volume=TestVolume001 MaxVolBytes=500000 pool=Default drive=0
 list volumes
-@#setdebug level=150 storage=DDS-4
+@#setdebug level=150 storage=tape
 run job=$JobName yes
 @# This sleep must be long enough for the first tape to fill (4MB)
 @#  otherwise the following mtx-changer commands will fail
 @#sleep $sleep
 wait mount timeout=180
 list volumes
-unmount storage=DDS-4
+unmount storage=tape
 list volumes
-status storage=DDS-4
+status storage=tape
 messages
 quit
 END_OF_DATA
@@ -80,24 +80,23 @@ load_other_slot $slot
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/log1.out
 wait mount timeout=180
-setdebug level=200 storage=DDS-4
-mount storage=DDS-4
+setdebug level=200 storage=tape
+mount storage=tape
 @# backup should continue
 wait
 list volumes
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 @sleep $sleep
 wait mount timeout=180
 exec "sh -c 'load_other_slot $slot'"
-unmount storage=DDS-4
+unmount storage=tape
 list volumes
 messages
 wait
-@$out
 quit
 END_OF_DATA
 
@@ -106,7 +105,7 @@ run_bconsole
 
 touch tmp/log2.out
  
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs