ebl add 3 others errors

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

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 46bdc23db96a170f11dd04e1afb61279983b8b6f..5c7179539bb632b6baa026b29b7496eb9b551501 100644 (file)
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -22,6 +22,7 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
+  fdconnecttimeout = 10
 }
 
 JobDefs {
@@ -46,6 +47,13 @@ Job {
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
 
+FileSet {
+ Name = FS_TEST
+ Include {
+   File=</tmp/file-list
+ }
+}
+
 FileSet {
  Name = FS_REMOTE_INC_ERROR
  Include {
@@ -104,6 +112,34 @@ Job {
   Run After Job = "/bin/echo RunAfterJob"
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
+Job {
+  Name = "REMOTE_RUNSCRIPT_ERROR"
+  JobDefs = DefaultJob
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/false"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "LOCAL_RUNSCRIPT_ERROR"
+  JobDefs = DefaultJob
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/false"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "CLIENT_CONNECT_TIMEOUT"
+  JobDefs = DefaultJob
+  Client = @hostname@2-fd
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
 
 # Client (File Services) to backup
 Client {
@@ -118,6 +154,19 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
+# Client (File Services) to backup
+Client {
+  Name = @hostname@2-fd
+  Address = @hostname@
+  FDPort = 7102
+  Catalog = MyCatalog
+  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
+  File Retention = 30d                # 30 days
+  Job Retention = 180d                # six months
+  AutoPrune = yes                     # Prune expired Jobs/Files
+  Maximum Concurrent Jobs = 4
+}
+
 # Definiton of file storage device
 Storage {
   Name = File

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index 244e3524d2762e3654f477b36d87784185f525a7..0af3ea7b6569b38f2c517a3784316a4a43cabb70 100755 (executable)
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -37,6 +37,18 @@ messages
 run job=REMOTE_EXCL_ERROR yes
 wait
 messages
+@$out tmp/REMOTE_RUNSCRIPT_ERROR.log
+run job=REMOTE_RUNSCRIPT_ERROR yes
+wait
+messages
+@$out tmp/LOCAL_RUNSCRIPT_ERROR.log
+run job=LOCAL_RUNSCRIPT_ERROR yes
+wait
+messages
+@$out tmp/CLIENT_CONNECT_TIMEOUT.log
+run job=CLIENT_CONNECT_TIMEOUT yes
+wait
+messages
 st dir
 quit
 END_OF_DATA
@@ -44,7 +56,7 @@ END_OF_DATA
 run_bacula
 touch tmp/log1.out
 check_for_zombie_jobs storage=File
-stop_bacula
+#stop_bacula
 
 dstat=0
 bstat=0
@@ -54,4 +66,4 @@ export bstat
 export rstat
 
 
-end_test
+#end_test