more mkdir -p changes

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

diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index 47a8cb96e8a7b86e07b962f957788211c6d05fa6..01723d15377283076b20a64149161c27fcc9834f 100755 (executable)
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -22,7 +22,7 @@ fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
@@ -39,11 +39,11 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0
+label storage=tape volume=TestVolume001 slot=1 pool=Scratch drive=0
+label storage=tape volume=TestVolume002 slot=2 pool=Scratch drive=0
 update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0
 update Volume=TestVolume001 inchanger=no pool=Scratch drive=0
-@#setdebug level=200 storage=DDS-4
+@#setdebug level=200 storage=tape
 llist volume=TestVolume001
 llist volume=TestVolume002
 run job=$JobName yes
@@ -55,16 +55,15 @@ llist volume=TestVolume001
 @# 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_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs