X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-volume-changer;h=5e3462570aa4b9cc1397f0b6c1cd2cb6a52a9878;hb=9069d2fe01f419778c977cd4db47bb9e6b52cd02;hp=e775a7bf793fbaa7a6fa0878311dd65816a5417c;hpb=fac1b9715567f19ce5a9753b7a84b9766dac5c82;p=bacula%2Fbacula

diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer
index e775a7bf79..5e3462570a 100755
--- a/regress/tests/two-volume-changer
+++ b/regress/tests/two-volume-changer
@@ -31,15 +31,15 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
-label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
-update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
+update Volume=TestVolume002 MaxVolBytes=3000000 pool=Default drive=$DRIVE1
 sql
 select * from Storage;
 select VolumeName,InChanger,Slot,StorageId from Media;
 
 @#setdebug level=1000 client=$CLIENT 
-@#setdebug level=250 storage=DDS-4
+setdebug level=150 storage=tape
 run job=$JobName yes
 wait
 sql
@@ -51,10 +51,10 @@ quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
-bin/${AUTOCHANGER_SCRIPT} ${AUTOCHANGER} unload $SLOT2 ${TAPE_DRIVE} 0
+$scripts/${AUTOCHANGER_SCRIPT} ${AUTOCHANGER} unload $SLOT2 ${TAPE_DRIVE} 0
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -63,16 +63,15 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-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
 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