Ensure correct client specified when checking for zombies

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

diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index 2b568f6c1eea9e564fa0e42f8b732ab1d1fabb07..b5d235ae197ba2c47b033b54a09a33019945c17f 100755 (executable)
--- 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,9 +12,7 @@
 TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
-set_debug 0
 
-. config.out
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
@@ -22,10 +20,9 @@ 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" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
-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
 
 start_test
 
@@ -34,20 +31,18 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-@#setdebug level=150 storage=DDS-4
+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
 @# 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
 @# wait between starting jobs
 @sleep 30
 @#setdebug level=100 storage=DDS-4
 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
@@ -62,6 +57,8 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
+release storage=DDS-4 drive=0
+release storage=DDS-4 drive=1
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait