X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-pool-test;h=e6d729acc66deba268a14e3cdb1e0fba77729017;hb=5dd06f639b5e883410a3af50727706a3d16e4028;hp=bec846f2363bbcf814ba7d1636ba3f0a091eb22b;hpb=7f350ed9bd70b3cbfdb0d48d091710eb1a6101ac;p=bacula%2Fbacula

diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index bec846f236..e6d729acc6 100755
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -4,7 +4,7 @@
 #  an autochanger. Note, the Director has three Pools in its 
 #  conf:  Default, Full, and Inc.  Default is used in the
 #  NightlySave job by default.  What is backed up is what
-#  is in /tmp/file-list, which is by default the Bacula
+#  is in ${cwd}/tmp/file-list, which is by default the Bacula
 #  source code (i.e. the build directory).
 #
 #  Note, we use the virtual disk autochanger.
@@ -12,13 +12,7 @@
 TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
-set_debug 0
 
-. config.out
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "two-pool-test skipped. No autochanger."
-   exit
-fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
@@ -26,7 +20,10 @@ scripts/prepare-two-disks
  
 # Make a relatively large backup set 5 x source code directory
 #  Reduced to 1 for portable
-echo "${cwd}/build" >/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
 
@@ -35,6 +32,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
@@ -43,7 +41,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