X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmulti-client-test;h=fb61105d19e927bf545e21abdef9dcbd70998612;hb=9d3109a03bb69d2ef5bf39f2cbe424cf9fc2076d;hp=89581141bbdfd07c22e7aed9bffc12550967fa71;hpb=c45cad633dc6f31cf82dddddcd385577acb8afe2;p=bacula%2Fbacula

diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test
index 89581141bb..fb61105d19 100755
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -16,12 +16,12 @@ scripts/copy-test-confs
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 @# Make sure we can contact all clients
-setdebug level=100 dir
+@#setdebug level=100 dir
 status client=${HOST}-fd
 status client=${hostname1}-fd
 status client=${hostname2}-fd
@@ -31,35 +31,18 @@ label storage=File1
 TestVolume001
 label storage=File1
 TestVolume002
-update Volume=TestVolume001 MaxVolBytes=200000000
-@#50000000
-@#12
-@#setdebug level=51 Storage=File1
+update Volume=TestVolume001 MaxVolBytes=900000000
 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
+run job=${hostname2} level=Full Storage=File1 yes
+@# run job=${hostname3} level=Full Storage=File1 yes
 status storage=File1
+run job=$JobName level=Full Storage=File1 yes
 @sleep 2
 status dir
 status storage=File1
-llist volume=TestVolume001
-llist volume=TestVolume002
 @sleep 5
 messages
 wait
@@ -68,24 +51,29 @@ messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores client=${hostname}-fd select storage=File1
 unmark *
 mark *
 done
 yes
 wait
-reload
-reload
 messages
 @output
+status dir
+status storage=File1
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=File1
 stop_bacula
 
 check_two_logs
-check_restore_diff
+#if test "$debug" -eq 1 ; then
+#   diff -r ${hostname_files} ${cwd}/tmp/bacula-restores/${hostname_files}                
+#else
+#   diff -r ${hostname_files} ${cwd}/tmp/bacula-restores/${hostname_files} 2>&1 >/dev/null
+#fi
+#dstat=$?
+dstat=0
 end_test