X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ferrors-test;h=5a57c42350469daa97670d8ced79b7cb1cc2c6b7;hb=70f4723a1094c8c55d7a501ff52c1ff51a3542bf;hp=0af3ea7b6569b38f2c517a3784316a4a43cabb70;hpb=4416a647f22169c1ca579acc017aacf778fdb1c7;p=bacula%2Fbacula

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index 0af3ea7b65..5a57c42350 100755
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -7,56 +7,66 @@ TestName="errors-test"
 JobName=backup
 
 . scripts/functions
+
+scripts/cleanup
 copy_test_confs
-set_debug 0
 
-rm -f tmp/*.log
+rm -f ${cwd}/tmp/*.log
 /bin/cp -f scripts/bacula-dir.conf.errors bin/bacula-dir.conf
-
-echo "${cwd}/build/po" >/tmp/file-list
+echo "${cwd}/build/po" >${cwd}/tmp/file-list
 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-label volume=TestVolume001
-@output tmp/LOCAL_INC_ERROR.log
-run job=LOCAL_INC_ERROR yes
+@output ${cwd}/tmp/LOCAL_INC_ERR.log
+label storage=File volume=TestVolume001
+add storage=File2
+1
+File2
+1
+run job=LOCAL_INC_ERR yes
 wait
 messages
-@output tmp/REMOTE_INC_ERROR.log
-run job=REMOTE_INC_ERROR yes
+@output ${cwd}/tmp/REMOTE_INC_ERR.log
+run job=REMOTE_INC_ERR yes
 wait
 messages
-@output tmp/LOCAL_EXCL_ERROR.log
-run job=LOCAL_EXCL_ERROR yes
+@output ${cwd}/tmp/LOCAL_EXCL_ERR.log
+run job=LOCAL_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_EXCL_ERROR.log
-run job=REMOTE_EXCL_ERROR yes
+@$out ${cwd}/tmp/REMOTE_EXCL_ERR.log
+run job=REMOTE_EXCL_ERR yes
 wait
 messages
-@$out tmp/REMOTE_RUNSCRIPT_ERROR.log
-run job=REMOTE_RUNSCRIPT_ERROR yes
+@$out ${cwd}/tmp/REMOTE_RUNSCRIPT_ERR.log
+run job=REMOTE_RUNSCRIPT_ERR yes
 wait
 messages
-@$out tmp/LOCAL_RUNSCRIPT_ERROR.log
-run job=LOCAL_RUNSCRIPT_ERROR yes
+@$out ${cwd}/tmp/LOCAL_RUNSCRIPT_ERR.log
+run job=LOCAL_RUNSCRIPT_ERR yes
 wait
 messages
-@$out tmp/CLIENT_CONNECT_TIMEOUT.log
+@$out ${cwd}/tmp/CLIENT_CONNECT_TIMEOUT.log
 run job=CLIENT_CONNECT_TIMEOUT yes
 wait
 messages
-st dir
+@$out ${cwd}/tmp/SD_CONNECT_TIMEOUT.log
+run job=SD_CONNECT_TIMEOUT yes
+wait
+messages
+status dir
+status storage=File
 quit
 END_OF_DATA
 
 run_bacula
-touch tmp/log1.out
-check_for_zombie_jobs storage=File
-#stop_bacula
+touch ${cwd}/tmp/log1.out
+client=`grep client= $bin/bacula-dir.conf`
+check_for_zombie_jobs storage=File $client
+stop_bacula
 
 dstat=0
 bstat=0
@@ -66,4 +76,4 @@ export bstat
 export rstat
 
 
-#end_test
+end_test