X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fthree-pool-test;h=08cefc05d80afe882000ca4d967cf43e6a05809f;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=92ff97f6564de2d380b49aa260e705c655f78a3c;hpb=cdae8931ba557fe18fa330660b6e47a09c4e5b5a;p=bacula%2Fbacula

diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 92ff97f656..08cefc05d8 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -13,7 +13,8 @@ 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
 change_jobname NightlySave $JobName
@@ -29,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 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
+@#setdebug level=200 storage=tape
+@#setdebug level=200 client=$CLIENT 
+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
@@ -64,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