Many debug code fixes in regression scripts

[bacula/bacula] / regress / tests / two-volume-changer

diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer
index e06cf230655b1eabe7c0c749c46dbc3b05738a59..49cbb036b40a1bdf69222543c300539b607e663b 100755 (executable)
--- a/regress/tests/two-volume-changer
+++ b/regress/tests/two-volume-changer
@@ -33,13 +33,13 @@ 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=0
+update Volume=TestVolume002 MaxVolBytes=3000000 pool=Default drive=$DRIVE1
 sql
 select * from Storage;
 select VolumeName,InChanger,Slot,StorageId from Media;
 
-@#setdebug level=1000 client 
-@#setdebug level=250 storage=DDS-4
+@#setdebug level=1000 client=$CLIENT 
+setdebug level=150 storage=DDS-4
 run job=$JobName yes
 wait
 sql
@@ -54,9 +54,7 @@ run_bacula
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
 
-mt -f ${TAPE_DRIVE} rewind
-mtx -f ${AUTOCHANGER} unload
-sleep 15
+$scripts/${AUTOCHANGER_SCRIPT} ${AUTOCHANGER} unload $SLOT2 ${TAPE_DRIVE} 0
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -69,7 +67,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA