X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-pool-changer;h=d121c0be02b8621880a71877c4b58dea31edf474;hb=d47b681717803cdb66c36002f698926b347839bb;hp=0cc9cb7534ccd7edc3cb14cede379fe0269ed306;hpb=d00d4e34ea2f7d3d35a508fb134bab22152ba7f6;p=bacula%2Fbacula

diff --git a/regress/tests/two-pool-changer b/regress/tests/two-pool-changer
index 0cc9cb7534..d121c0be02 100755
--- a/regress/tests/two-pool-changer
+++ b/regress/tests/two-pool-changer
@@ -24,35 +24,31 @@ echo "Done prepare two tapes"
 echo "${cwd}/build" >${cwd}/tmp/file-list
 echo "${cwd}/build" >>${cwd}/tmp/file-list
 echo "${cwd}/build" >>${cwd}/tmp/file-list
-echo "${cwd}/build" >>${cwd}/tmp/file-list
-echo "${cwd}/build" >>${cwd}/tmp/file-list
+# echo "${cwd}/build" >>${cwd}/tmp/file-list
+# echo "${cwd}/build" >>${cwd}/tmp/file-list
 
 start_test
 
 # Write out bconsole commands to a file
 cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1
-label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1
+label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
 list volumes
 @# Start job with Client run before and sleep
 run job=NightlySave1 level=Full pool=Default yes
 run job=NightlySave1 level=Full pool=Default yes
-run job=NightlySave1 level=Full pool=Default yes
+#run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 60
-setdebug level=190 storage=DDS-4
-run job=NightlySave2 level=Full pool=Full yes
+setdebug level=190 storage=tape
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes
+#run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
-messages
-@sleep 10
-messages
-@sleep 10
-status storage=DDS-4
+status storage=tape
 messages
 wait
 list volumes
@@ -61,16 +57,15 @@ messages
 @# now do a restore
 @#
 @$out 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