X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fscripts%2Fbacula-dir.conf.testrunscript.in;h=705581bfad7dd5ab399c036777b97c196b7d0de3;hb=1c260628d063ac18a83992f9b9e7c90bec0afbbf;hp=c93a4ce7a78c870a94759e18b4a95f333e1ba991;hpb=d1b8404967060594684bb2448fde7f698b27396c;p=bacula%2Fbacula

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index c93a4ce7a7..705581bfad 100644
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -21,7 +21,7 @@ Director {                            # define myself
   SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
-  Messages = Daemon
+  Messages = Standard
 }
 
 JobDefs {
@@ -87,12 +87,49 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_FAILED1"
-    abortjobonerror = no
+    failjobonerror = no
+    RunsWhen = Before
+  }
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED2"
+    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"
+#we dont execute FAILED2 
+#@hostname@-dir: AfterJob: run command "/bin/echo RunAfterFailedJob"
+Job {
+  Name = "RUN_FD_FAILED2"
+  FileSet = FS_TESTJOB  
+  JobDefs = DefaultJob
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED1"
+    failjobonerror = yes
     RunsWhen = Before
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED2"
-    abortjobonerror = yes
+    failjobonerror = yes
+    RunsWhen = Before
+  }
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED3"
+    failjobonerror = yes
+    RunsOnFailure = yes
     RunsWhen = Before
   }
 
@@ -107,12 +144,37 @@ 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_897
+  JobDefs = DefaultJob
+  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 {
   Name = @hostname@-fd
@@ -140,46 +202,13 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r
-"
-  MailOnError = @job_email@ = all
-  operator = @job_email@ = mount
-  console = all, !skipped, !terminate, !restored
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-Messages {
-  Name = NoEmail
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  console = all, !skipped, !terminate
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped
   console = all, !skipped, !saved
-  append = "@working_dir@/log" = all, !skipped
 }
 
 # Default pool definition