Merge branch 'master' of ssh://kerns@bacula.git.sourceforge.net/gitroot/bacula/bacula

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

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 1266e75d76c84605555cf775d4c28a6cd2e35751..00ced3b4a1b72738f249518a521c72e3bba07a67 100755 (executable)
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -14,7 +14,7 @@ JobName=TwoVolume
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
@@ -31,17 +31,17 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=1 pool=Default drive=0
+label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0
 update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0
 sql                               
 select * from Storage;
 select VolumeName,InChanger,StorageId from Media;
 
-@#setdebug level=1000 client 
+@#setdebug level=1000 client=$CLIENT 
 run job=$JobName yes
 wait
-update slots scan storage=DDS-4
+update slots scan storage=tape
 sql                               
 select * from Storage;
 select VolumeName,InChanger,StorageId from Media;
@@ -51,16 +51,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