Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / errors-test

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
old mode 100644 (file)
new mode 100755 (executable)
index 244e352..0b9865e
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -7,43 +7,65 @@ 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
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
+messages
+@$out ${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
+@$out ${cwd}/tmp/REMOTE_INC_ERR.log
+run job=REMOTE_INC_ERR yes
+wait
+messages
+@$out ${cwd}/tmp/LOCAL_EXCL_ERR.log
+run job=LOCAL_EXCL_ERR yes
+wait
+messages
+@$out ${cwd}/tmp/REMOTE_EXCL_ERR.log
+run job=REMOTE_EXCL_ERR yes
+wait
 messages
-label volume=TestVolume001
-@output tmp/LOCAL_INC_ERROR.log
-run job=LOCAL_INC_ERROR yes
+@$out ${cwd}/tmp/REMOTE_RUNSCRIPT_ERR.log
+run job=REMOTE_RUNSCRIPT_ERR yes
 wait
 messages
-@output tmp/REMOTE_INC_ERROR.log
-run job=REMOTE_INC_ERROR yes
+@$out ${cwd}/tmp/LOCAL_RUNSCRIPT_ERR.log
+run job=LOCAL_RUNSCRIPT_ERR yes
 wait
 messages
-@output tmp/LOCAL_EXCL_ERROR.log
-run job=LOCAL_EXCL_ERROR yes
+@$out ${cwd}/tmp/CLIENT_CONNECT_TIMEOUT.log
+run job=CLIENT_CONNECT_TIMEOUT yes
 wait
 messages
-@$out tmp/REMOTE_EXCL_ERROR.log
-run job=REMOTE_EXCL_ERROR yes
+@$out ${cwd}/tmp/SD_CONNECT_TIMEOUT.log
+run job=SD_CONNECT_TIMEOUT yes
 wait
 messages
-st dir
+status dir
+status storage=File
 quit
 END_OF_DATA
 
 run_bacula
-touch tmp/log1.out
-check_for_zombie_jobs storage=File
+touch ${cwd}/tmp/log1.out
+client=`grep client= $bin/bacula-dir.conf`
+check_for_zombie_jobs storage=File $client
 stop_bacula
 
 dstat=0