Tweak errors-test

[bacula/bacula] / regress / scripts / bacula-dir.conf.testrunscript.in

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index 6786e8abac1be9ef4f9546e614b6c0a60f56cec8..705581bfad7dd5ab399c036777b97c196b7d0de3 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -87,16 +87,26 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_FAILED1"
-    abortjobonerror = no
+    failjobonerror = no
     RunsWhen = Before
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED2"
-    abortjobonerror = yes
+    failjobonerror = yes
     RunsWhen = Before
   }
 
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
+  RunScript {
+    Command = "/bin/echo touching /tmp/RUN_FD_FAILED"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+  RunScript {
+    Command = "/bin/touch /tmp/RUN_FD_FAILED"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
 }
 
 #@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"
@@ -108,17 +118,17 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_FAILED1"
-    abortjobonerror = yes
+    failjobonerror = yes
     RunsWhen = Before
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED2"
-    abortjobonerror = yes
+    failjobonerror = yes
     RunsWhen = Before
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED3"
-    abortjobonerror = yes
+    failjobonerror = yes
     RunsOnFailure = yes
     RunsWhen = Before
   }
@@ -134,18 +144,36 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_WARNING"
-    abortjobonerror = no
+    failjobonerror = no
     RunsWhen = Before
   }
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
 }
 
+FileSet {
+ Name = FS_FIFO
+ Include {
+   Options { readfifo = yes }
+   File=</tmp/file-list
+ }
+}
+
 Job {
-  Name = BUG_FATAL
+  Name = BUG_897
   JobDefs = DefaultJob
-  FileSet = FS_TESTJOB
-}
+  FileSet = FS_FIFO
 
+  RunScript {
+    Command = "/bin/echo touching /tmp/RUN_BUG_897"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+  RunScript {
+    Command = "/bin/touch /tmp/RUN_BUG_897"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+}
 
 # Client (File Services) to backup
 Client {