From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 7 Sep 2007 15:55:30 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~5717
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c45cad633dc6f31cf82dddddcd385577acb8afe2;p=bacula%2Fbacula

Update

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

diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in
index 3ee7eba306..4ddb127a5b 100644
--- a/regress/scripts/multi-client-bacula-dir.conf.in
+++ b/regress/scripts/multi-client-bacula-dir.conf.in
@@ -73,23 +73,9 @@ Job {
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
-  SpoolData=yes
 }
 
 
-Job {
-  Name = "NightlySave"
-  Type = Backup
-  Client=@hostname@-fd 
-  FileSet="Full Set"
-  Storage = File
-  Messages = Standard
-  Pool = Default
-  Write Bootstrap = "@working_dir@/NightlySave.bsr"
-  Maximum Concurrent Jobs = 4
-  SpoolData=yes
-}
-
 
 Job {
   Name = "MonsterSave"
diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test
index fa426143d6..89581141bb 100755
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -20,6 +20,13 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out   tmp/log1.out
+@# Make sure we can contact all clients
+setdebug level=100 dir
+status client=${HOST}-fd
+status client=${hostname1}-fd
+status client=${hostname2}-fd
+status client=${hostname3}-fd
+setdebug level=1 dir
 label storage=File1
 TestVolume001
 label storage=File1
@@ -62,7 +69,7 @@ messages
 @# now do a restore
 @#
 @$out   tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores client=${hostname} select storage=File1
+restore where=${cwd}/tmp/bacula-restores client=${hostname}-fd select storage=File1
 unmark *
 mark *
 done