Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / vol-duration-changer

diff --git a/regress/tests/vol-duration-changer b/regress/tests/vol-duration-changer
index 1ffda0fff1101bef3f523a3529208a438cf80e71..a27a6c75d8d93e105b0b4332057c981d5051bb40 100755 (executable)
--- a/regress/tests/vol-duration-changer
+++ b/regress/tests/vol-duration-changer
@@ -26,17 +26,17 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=100 storage=DDS-4
-label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
-label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1
+setdebug level=100 storage=tape
+label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1
 update Volume=TestVolume001 VolUse=30
 update Volume=TestVolume002 VolUse=30
-run job=$JobName level=Full Storage=DDS-4 yes
+run job=$JobName level=Full Storage=tape yes
 @sleep 31
-run job=$JobName level=Full Storage=DDS-4 yes
+run job=$JobName level=Full Storage=tape yes
 wait
 messages
 list volumes
@@ -44,19 +44,18 @@ list volumes
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select storage=tape
 unmark *
 mark *
 done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs