Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / three-pool-test

diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index ba4597f3765693fcccfc8772a97d87d6d74bc36b..08cefc05d80afe882000ca4d967cf43e6a05809f 100755 (executable)
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -13,7 +13,7 @@ JobName="threepooldisk"
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
 CLIENT=2drive2disk
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
@@ -30,27 +30,27 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@#setdebug level=200 storage=DDS-4
+@#setdebug level=200 storage=tape
 @#setdebug level=200 client=$CLIENT 
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=0
-label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     drive=1
-status storage=DDS-4
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume002 slot=2 Pool=Full    drive=0
+label storage=tape volume=TestVolume003 slot=3 Pool=Inc     drive=1
+status storage=tape
 run job=$JobName level=Full Pool=Default yes
 run job=$JobName level=Full Pool=Default yes
 run job=$JobName level=Full Pool=Default yes
 run job=$JobName level=Full Pool=Default yes
 run job=$JobName level=Full Pool=Default yes
 @sleep 10
-status storage=DDS-4
+status storage=tape
 list volumes
 wait
 list volumes
 list jobs
-status storage=DDS-4
+status storage=tape
 messages
 quit
 END_OF_DATA
@@ -65,17 +65,16 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/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_bconsole
 
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs