Tweaks

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4541 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index bd7e20f8850448cd6cf32ee351124aba71058e3c..6e9e37bebb691ac24ef90812da164f3460a4c3ec 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -25,6 +25,7 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
+setdebug level=000 Storage=File1
 run job=$JobName level=Full Storage=File1
 yes
 reload
@@ -48,6 +49,7 @@ messages
 reload
 reload
 wait
+status storage=File1
 reload
 messages
 @# 

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index 2a1ce858c775eea614c63ced8b40a04893a26d0c..68d14a7301cfee8eb9ad71f5a8cd78806dc4a1ce 100755 (executable)
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -31,10 +31,11 @@ TestVolume002
 update volume=TestVolume001
 1
 .
-run job=NightlySave level=Full yes
+run job=$JobName level=Full yes
 @sleep 20
 unmount
 unmount
+@#setdebug level=150 storage=DDS-4
 purge volume=TestVolume001
 relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default
 list volumes

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 9da395ae697b013066e228c212b42a75891a1dad..2cf5717d1746012206106b65cab3e56767ee079f 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -10,7 +10,7 @@
 TestName="two-pool-tape"
 JobName=twopooltape
 . scripts/functions
-set_debug 0
+set_debug 1
 
 . config.out
 if test x${AUTOCHANGER} = x/dev/null ; then

diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index eb6f0e50f2c26129168cb4ed68bdb479a3814fda..80fd536a7f823ec89114b794762798ef3c8916ec 100755 (executable)
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -12,7 +12,7 @@
 TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
-set_debug 0
+set_debug 1
 
 . config.out
 cwd=`pwd`
@@ -34,6 +34,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
+@#setdebug level=150 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
 list volumes
@@ -42,7 +43,7 @@ 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
+@sleep 30
 @#setdebug level=100 storage=DDS-4
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes