Update for new job output

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 48d89b6eb3c4b1e36d03036b8e9f5eb5487b46ff..9cbb557727f9db9e273dab90a22e5a96b16f06dd 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -20,7 +20,7 @@ Director {                            # define myself
   PidDirectory = "@piddir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"
-  Messages = Standard
+  Messages = Daemon
 }
 
 #
@@ -122,6 +122,16 @@ Messages {
   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
 Pool {

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 57286c39d6dbbe37a684468a107dfcaf33e289ca..e13bef283861a13b0992ef3c78982383212e4bef 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -21,7 +21,7 @@ Director {                            # define myself
   SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
-  Messages = Standard
+  Messages = Daemon
 }
 
 #
@@ -287,6 +287,15 @@ Messages {
   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
 Pool {

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 347bb8cbcb5fa6198e0481948f5df7f09752569f..7f248bac820ec4d783a05f166c8bc54fda6b63fc 100755 (executable)
Binary files a/regress/tests/auto-label-test and b/regress/tests/auto-label-test differ

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 17478dffa7f0b1fa4623d2a02e61b318eae1ec1e..4eedff42f82851aa76ba88dd139fcf28c6595fd0 100755 (executable)
Binary files a/regress/tests/backup-bacula-tape and b/regress/tests/backup-bacula-tape differ

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 84dec154af4d473aedbd8d14aba38d010d489b6b..ecf1d3bef43c0272f2ab59df3358737139f806ef 100755 (executable)
Binary files a/regress/tests/backup-bacula-test and b/regress/tests/backup-bacula-test differ

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 1521ab67a523e176b9b7e28fd7d8042cbf25d08a..8a55c19da0b787b0a5e02c18d7f7b0282db9c945 100755 (executable)
Binary files a/regress/tests/bextract-test and b/regress/tests/bextract-test differ

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index de01721b3b22f440515a970f11b90e882fa53872..8858b6a8776e3b1bc18aee37705ee2387be32cab 100755 (executable)
Binary files a/regress/tests/bscan-tape and b/regress/tests/bscan-tape differ

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 310a1806c182b4a6b87113e21b7233e870051683..3194a65145e2a2b4a0f3a8661d4048e3a4477c9d 100755 (executable)
Binary files a/regress/tests/bscan-test and b/regress/tests/bscan-test differ

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 74002e23a4b3433338d6abe6f9569fd0dc0a7085..7284cc1565d1aae0b419ca8732ec48d390816625 100755 (executable)
Binary files a/regress/tests/bsr-opt-test and b/regress/tests/bsr-opt-test differ

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index f2032ef7b34e30a74ec71432d2b3f4f324b4873a..6bd5d415b1c23964ae91026cf2ec6feae286d858 100755 (executable)
Binary files a/regress/tests/compressed-test and b/regress/tests/compressed-test differ

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index e15c3ba3c7e7348cc566c0b5904c4e63a1636c76..1f4deeb5926db9725f5a4d16fe4ee625f587812f 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -58,9 +58,9 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then

diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test
index fc1ce98c12cd40409a7c71502c05b285bb3891a6..41b274350b4167d0ab3d8446c71c357ef68d424f 100755 (executable)
Binary files a/regress/tests/decremental-test and b/regress/tests/decremental-test differ

diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 36faadf517222855feb58e15af0c259c6499e326..23fe49a390bee16f545de3b6d5c5da04a163a55b 100755 (executable)
Binary files a/regress/tests/fixed-block-size-tape and b/regress/tests/fixed-block-size-tape differ

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 48109cbb84a8b221c2dcd910f8c697cc718e5a8b..17f9d350f98c6ece0af962e26f89ff7399eea05f 100755 (executable)
Binary files a/regress/tests/four-concurrent-jobs-tape and b/regress/tests/four-concurrent-jobs-tape differ

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 7d2d5329b0dbaa393fc060deeb28f862cfd60654..97772f71272b93b85c44013881c566d3a8f1e7cb 100755 (executable)
Binary files a/regress/tests/four-concurrent-jobs-test and b/regress/tests/four-concurrent-jobs-test differ

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 9d930bf2581c542e71c21051acc939be1c6e52dc..90deecfe2e1c7676318abce064608e3e5700b92c 100755 (executable)
Binary files a/regress/tests/four-jobs-tape and b/regress/tests/four-jobs-tape differ

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 2356303c2e9979cdef5985550a9c5c7b64ba1819..092d88a9415099542985dcc976b12a1bc0f695cc 100755 (executable)
Binary files a/regress/tests/four-jobs-test and b/regress/tests/four-jobs-test differ

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 6ed796897f4042479032c74fa96fdb0eee44939f..695a033ee0373d37151e6c00818bffd520b24c49 100755 (executable)
Binary files a/regress/tests/incremental-2tape and b/regress/tests/incremental-2tape differ

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 602df9cd6052870218b42d3e70152c11be896023..9a5b39605f58864c0cc037279868a5a437a7307a 100755 (executable)
Binary files a/regress/tests/incremental-tape and b/regress/tests/incremental-tape differ

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index b740ccf0bdb0ace02390341ebdbae32667dfd10a..7b0581c254e6d611575791209833d038679e81a7 100755 (executable)
Binary files a/regress/tests/incremental-test and b/regress/tests/incremental-test differ

diff --git a/regress/tests/query-test b/regress/tests/query-test
index 11a88cb31936462e469e0794d516dbe6e81702f6..4c6523b449e51b7bee3c98d3b82ca7d853060356 100755 (executable)
Binary files a/regress/tests/query-test and b/regress/tests/query-test differ

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 6dbc60c5a51548a491d928ad98c399464b1ecef7..df8a0ec7de37777e5b20ecbbd819931c10cd27d7 100755 (executable)
Binary files a/regress/tests/recycle-test and b/regress/tests/recycle-test differ

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 21013b36cd3a17795b73d264785003572f25eb5e..45ff1755f31c727c4fb01a6ceb5d619afb70f9f0 100755 (executable)
Binary files a/regress/tests/restore-by-file-tape and b/regress/tests/restore-by-file-tape differ

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 9ee99589504d999fccd935ec4b056e07ac8d3de9..5d1762c1381879a88593ddb9675a11612cfae9b1 100755 (executable)
Binary files a/regress/tests/restore-by-file-test and b/regress/tests/restore-by-file-test differ

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 76372a363c5734810819a3a41b61c894c3c1831c..c9dba179001b928760e13778763c12ca1b1eb15a 100755 (executable)
Binary files a/regress/tests/restore-disk-seek-test and b/regress/tests/restore-disk-seek-test differ

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 53a259889b2dd9a9c29b0ed8c5578267ac6cc322..3d31a2bad19335bcad01ae723cf51dc44be6b01e 100755 (executable)
Binary files a/regress/tests/restore2-by-file-test and b/regress/tests/restore2-by-file-test differ

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index bf55e1ae8ce35b13a6636f6f6f9ce3c8f914060e..cb10f73143d3b363cea8eb35ab3d4c3c11125735 100755 (executable)
Binary files a/regress/tests/six-vol-test and b/regress/tests/six-vol-test differ

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index c98ab3805516e6d8a8fea412758d7062f0922661..9b7fa3faa2fd1755c0f445f679183feb583c5bdd 100755 (executable)
Binary files a/regress/tests/small-file-size-tape and b/regress/tests/small-file-size-tape differ

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 5136ab9a4f84df526ff7ebb4666793f8d2a3915d..2b68dc0d9caa7ab6486af77275655b0b21c0b6a2 100755 (executable)
Binary files a/regress/tests/span-vol-test and b/regress/tests/span-vol-test differ

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 11fc42a56a9ec34639f2e58409488f1c3caff05c..758ccef9fb01cba86d7945bc0eb30c3de346cb5c 100755 (executable)
Binary files a/regress/tests/sparse-compressed-test and b/regress/tests/sparse-compressed-test differ

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index c1c7328bd62b12803e0df32bc0ddcd48d32df56c..33ee35f7385b7386a9880487b5e6823a5314456e 100755 (executable)
Binary files a/regress/tests/sparse-test and b/regress/tests/sparse-test differ

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index e7d110bce1bb3bcef00c9ec9bbed0512ed4f4159..9ae89ea5a23d1a5567444e4b052aecd5be467fe4 100755 (executable)
Binary files a/regress/tests/two-jobs-test and b/regress/tests/two-jobs-test differ

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 1a8013346198dbecb70ad78697c494f936e4a532..adef8e4d1e838c5aa437679d7b79966fc7689829 100755 (executable)
Binary files a/regress/tests/two-vol-test and b/regress/tests/two-vol-test differ

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 2f603f9ee75685de5dfc63a12c483b8ab8275aad..d33e4e58b2d13e0f1a0e507e9cfce25337a8ec4b 100755 (executable)
Binary files a/regress/tests/two-volume-tape and b/regress/tests/two-volume-tape differ

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 35b404406df6b943bf3c55dd02b5e063d8193cf3..0fcc2ea5b537e827095e63d7ea68c940ce42d166 100755 (executable)
Binary files a/regress/tests/verify-vol-test and b/regress/tests/verify-vol-test differ

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 07aaf8b806b5784fb4c9dfc1b8d98fc838c37ab7..b4623fae5a4579d1032dc38872c375473250469e 100755 (executable)
Binary files a/regress/tests/weird-files-test and b/regress/tests/weird-files-test differ

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 0766cc63d60dceba3a073a42424aa8c27b8da2ca..3d16e77b11e45e4af7280aba5ccf35340836a874 100755 (executable)
Binary files a/regress/tests/weird-files2-test and b/regress/tests/weird-files2-test differ