Update

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

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 2f46089e987be28bda44401795a06da33579a038..b502715ffa17701b864edf0e0b6f609ab4fdc388 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -19,10 +19,12 @@ echo "s%@changer_path@%${AUTOCHANGER_PATH}%g" >>${out}
 echo "s%@tape_drive1@%${TAPE_DRIVE1}%g" >>${out}
 echo "s%@smtp_host@%${SMTP_HOST}%g" >>${out}
 echo "s%@disk_drive@%${cwd}/tmp/disk-changer%g" >>${out}
+echo "s%@hostname@%${hostname}%g" >>${out}
 echo "s%@hostname1@%${hostname1}%g" >>${out}
 echo "s%@hostname2@%${hostname2}%g" >>${out}
 echo "s%@hostname3@%${hostname3}%g" >>${out}
 echo "s%@hostname1_files@%${hostname1_files}%g" >>${out}
+echo "s%@hostname_files@%${hostname_files}%g" >>${out}
 echo "s%@hostname2_files@%${hostname2_files}%g" >>${out}
 echo "s%@hostname3_files@%${hostname3_files}%g" >>${out}
 echo "s%@hostname1_password@%${hostname1_password}%g" >>${out}

diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in
index 4ddb127a5bc8a2d307209ea7e90a20462f032aad..75bf0b987d2f28ca2ca00b50347bf9d460c136c1 100644 (file)
--- a/regress/scripts/multi-client-bacula-dir.conf.in
+++ b/regress/scripts/multi-client-bacula-dir.conf.in
@@ -172,7 +172,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include  { Options { signature=MD5 }
-    File = </tmp/file-list
+    File = @hostname_files@
   }
 }
 
@@ -280,7 +280,6 @@ Client {
   FDPort = 9102
   Catalog = MyCatalog
   Password = "@hostname2_password@"          # password for FileDaemon
-  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
   Job Retention = 180d                # six months
   AutoPrune = yes                     # Prune expired Jobs/Files

diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test
index 89581141bbdfd07c22e7aed9bffc12550967fa71..7fb1b59f077eb9f5eb15eee8de3bf2e53b21ec21 100755 (executable)
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -31,35 +31,29 @@ label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001 MaxVolBytes=200000000
+update Volume=TestVolume001 MaxVolBytes=500000000
 @#50000000
 @#12
 @#setdebug level=51 Storage=File1
 status storage=File1
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=${hostname1} level=Full Storage=File1
-yes
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=${hostname2} level=Full Storage=File1
-yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=${hostname3} level=Full Storage=File1
-yes
-llist volume=TestVolume001
-llist volume=TestVolume002
-status storage=File1
-run job=$JobName level=Full Storage=File1
-yes
+@#llist volume=TestVolume001
+@#llist volume=TestVolume002
+run job=${hostname1} level=Full Storage=File1 yes
+@#llist volume=TestVolume001
+@#llist volume=TestVolume002
+run job=${hostname2} level=Full Storage=File1 yes
+@#llist volume=TestVolume001
+@#llist volume=TestVolume002
+run job=${hostname3} level=Full Storage=File1 yes
+@#llist volume=TestVolume001
+@#llist volume=TestVolume002
 status storage=File1
+run job=$JobName level=Full Storage=File1 yes
 @sleep 2
 status dir
 status storage=File1
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#llist volume=TestVolume001
+@#llist volume=TestVolume002
 @sleep 5
 messages
 wait
@@ -75,10 +69,10 @@ mark *
 done
 yes
 wait
-reload
-reload
 messages
 @output
+status dir
+status storage=File1
 quit
 END_OF_DATA
 
@@ -87,5 +81,6 @@ check_for_zombie_jobs storage=File1
 stop_bacula
 
 check_two_logs
-check_restore_diff
+diff -r ${hostname_files} ${cwd}/tmp/bacula-restores/${hostname_files} 2>&1 >/dev/null
+dstat=$?
 end_test