X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fscratch-pool-test;h=01723d15377283076b20a64149161c27fcc9834f;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=f8fb24f88b23d62a4e7e7cf2af5d09e001abe98b;hpb=5fcf90dff3408e1f14722a222042ba36b952065f;p=bacula%2Fbacula

diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index f8fb24f88b..01723d1537 100755
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -14,9 +14,7 @@
 TestName="scratch-pool-test"
 JobName=scratch-pool
 . scripts/functions
-set_debug 0
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-volume-test skipped. No autochanger."
    exit
@@ -24,11 +22,11 @@ fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-outf="tmp/sed_tmp"
+outf="${cwd}/tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
@@ -37,15 +35,15 @@ change_jobname NightlySave $JobName
 start_test
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out 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
+@$out ${cwd}/tmp/log1.out
+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
@@ -56,17 +54,16 @@ llist volume=TestVolume001
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+@$out ${cwd}/tmp/log2.out
+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