regress: add function to create many dirs

[bacula/bacula] / regress / tests / 2drive-swap-test

diff --git a/regress/tests/2drive-swap-test b/regress/tests/2drive-swap-test
index a1eb027c113b962a5d406ef8066ddb776c49e7b7..c6a7773be0c14c2d6620a4ed2fed411b12119177 100755 (executable)
--- a/regress/tests/2drive-swap-test
+++ b/regress/tests/2drive-swap-test
@@ -11,7 +11,8 @@ JobName="2drive-swap"
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
+CLIENT=2drive2disk
 
 change_jobname NightlySave $JobName
 start_test
@@ -28,13 +29,13 @@ 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
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
-status storage=DDS-4
-@#setdebug level=120 storage=DDS-4
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1
+status storage=tape
+@#setdebug level=120 storage=tape
 run job=$JobName level=Full yes
 @sleep 2
 run job=$JobName level=Full yes
@@ -42,7 +43,7 @@ wait
 list volumes
 list jobs
 update volume=TestVolume001 maxvolbytes=40123123
-setdebug level=150 storage=DDS-4
+setdebug level=150 storage=tape
 run job=$JobName level=Full yes
 wait
 list volumes
@@ -59,16 +60,15 @@ 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