Merge branch 'master' of ssh://kerns@bacula.git.sourceforge.net/gitroot/bacula/bacula

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

diff --git a/regress/tests/scratchpool-pool-test b/regress/tests/scratchpool-pool-test
index dc019ca3cc529348918c1c8615ca2f27bc8d0144..194a19eb6f765fbceab0e4d172065d55ef448b74 100755 (executable)
--- a/regress/tests/scratchpool-pool-test
+++ b/regress/tests/scratchpool-pool-test
@@ -37,9 +37,9 @@ 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=SpecialScratch drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=SpecialScratch drive=0
-label storage=DDS-4 volume=TestVolume003 slot=3 pool=Scratch drive=0
+label storage=tape volume=TestVolume001 slot=1 pool=SpecialScratch drive=0
+label storage=tape volume=TestVolume002 slot=2 pool=SpecialScratch drive=0
+label storage=tape volume=TestVolume003 slot=3 pool=Scratch drive=0
 show pool=Default
 show pool=Special
 @########################
@@ -71,16 +71,15 @@ list volume pool=Special
 @# 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