From d355e1f66dce9d6ea0048b648f713f942321c35a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 15 Nov 2004 22:44:40 +0000 Subject: [PATCH] Update for new job output git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1699 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-dir-tape.conf.in | 12 +++++++++++- regress/scripts/test-bacula-dir.conf.in | 11 ++++++++++- regress/tests/auto-label-test | Bin 1801 -> 1801 bytes regress/tests/backup-bacula-tape | Bin 2698 -> 2698 bytes regress/tests/backup-bacula-test | Bin 1872 -> 1872 bytes regress/tests/bextract-test | Bin 1872 -> 1872 bytes regress/tests/bscan-tape | Bin 3564 -> 3564 bytes regress/tests/bscan-test | Bin 2367 -> 2367 bytes regress/tests/bsr-opt-test | Bin 2321 -> 2321 bytes regress/tests/compressed-test | Bin 1693 -> 1693 bytes regress/tests/concurrent-jobs-test | 4 ++-- regress/tests/decremental-test | Bin 2730 -> 2730 bytes regress/tests/fixed-block-size-tape | Bin 1808 -> 1808 bytes regress/tests/four-concurrent-jobs-tape | Bin 1578 -> 1578 bytes regress/tests/four-concurrent-jobs-test | Bin 2066 -> 2066 bytes regress/tests/four-jobs-tape | Bin 3117 -> 3117 bytes regress/tests/four-jobs-test | Bin 3367 -> 3367 bytes regress/tests/incremental-2tape | Bin 2352 -> 2352 bytes regress/tests/incremental-tape | Bin 2099 -> 2099 bytes regress/tests/incremental-test | Bin 4080 -> 4080 bytes regress/tests/query-test | Bin 2937 -> 2937 bytes regress/tests/recycle-test | Bin 2541 -> 2541 bytes regress/tests/restore-by-file-tape | Bin 3179 -> 3179 bytes regress/tests/restore-by-file-test | Bin 1869 -> 1869 bytes regress/tests/restore-disk-seek-test | Bin 2754 -> 2754 bytes regress/tests/restore2-by-file-test | Bin 1678 -> 1678 bytes regress/tests/six-vol-test | Bin 1927 -> 1927 bytes regress/tests/small-file-size-tape | Bin 1559 -> 1559 bytes regress/tests/span-vol-test | Bin 2052 -> 2052 bytes regress/tests/sparse-compressed-test | Bin 1726 -> 1726 bytes regress/tests/sparse-test | Bin 1627 -> 1627 bytes regress/tests/two-jobs-test | Bin 2338 -> 2338 bytes regress/tests/two-vol-test | Bin 1728 -> 1728 bytes regress/tests/two-volume-tape | Bin 1824 -> 1824 bytes regress/tests/verify-vol-test | Bin 1525 -> 1525 bytes regress/tests/weird-files-test | Bin 2131 -> 2131 bytes regress/tests/weird-files2-test | Bin 2209 -> 2209 bytes 37 files changed, 23 insertions(+), 4 deletions(-) diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index 48d89b6eb3..9cbb557727 100644 --- 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 57286c39d6..e13bef2838 100644 --- 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 GIT binary patch delta 20 bcmeC=>*U*TkeQKT@*!qdMuyECER4(mK*t3I delta 20 bcmeC=>*U*TkeM-V@*!qd#<doxj;D+OLz4!W diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 84dec154af4d473aedbd8d14aba38d010d489b6b..ecf1d3bef43c0272f2ab59df3358737139f806ef 100755 GIT binary patch delta 20 ccmcb>cY$xiA7(~|$$yz$85uS^v+yzl08$tRPyhe` delta 20 ccmcb>cY$xiA7;k5$$yz$8RIrPv+yzl09dpK3;+NC diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 1521ab67a523e176b9b7e28fd7d8042cbf25d08a..8a55c19da0b787b0a5e02c18d7f7b0282db9c945 100755 GIT binary patch delta 14 Vcmcb>cY$w11Pdd>=17+BOaLc*1k(Tj delta 14 Vcmcb>cY$w11Pf!_=17+BOaLjc1u*~s diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index de01721b3b22f440515a970f11b90e882fa53872..8858b6a8776e3b1bc18aee37705ee2387be32cab 100755 GIT binary patch delta 20 ccmaDO{YHAj4Q@t;$v3%O85uUq^PFV_09H;13;+NC delta 20 ccmaDO{YHAj4Q|G`$v3%O8RIs~^PFV_09@(^$N&HU diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 310a1806c182b4a6b87113e21b7233e870051683..3194a65145e2a2b4a0f3a8661d4048e3a4477c9d 100755 GIT binary patch delta 20 ccmdllv|nh$J61-9$?sWR85uU4vT-p308Y9F4*&oF delta 20 ccmdllv|nh$J66WH$?sWR8RIsavT-p309957%K!iX diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 74002e23a4b3433338d6abe6f9569fd0dc0a7085..7284cc1565d1aae0b419ca8732ec48d390816625 100755 GIT binary patch delta 20 ccmbOzG*M{7XBI|=$zNDp85uTPv0i5e07>@-i~s-t delta 20 ccmbOzG*M{7XBNh|$zNDp8RIrvv0i5e08o<$NB{r; diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index f2032ef7b34e30a74ec71432d2b3f4f324b4873a..6bd5d415b1c23964ae91026cf2ec6feae286d858 100755 GIT binary patch delta 20 bcmbQsJC}EZB{L(#WGiM@MuyD|%(Bb?IA{c} delta 20 bcmbQsJC}EZB{O5(WGiM@#<&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 GIT binary patch delta 20 ccmZ1_x=M7z6E;SM$xqo_85uTfv)3~N088oyMF0Q* delta 20 ccmZ1_x=M7z6E?=U$xqo_8RIr diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 48109cbb84a8b221c2dcd910f8c697cc718e5a8b..17f9d350f98c6ece0af962e26f89ff7399eea05f 100755 GIT binary patch delta 20 ccmZ3*vx;ZKF=j@F$;X*p85uV7vdA(407fkZZ2$lO delta 20 ccmZ3*vx;ZKF=ocN$;X*p8RItdvdA(408GgSDF6Tf diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index 7d2d5329b0dbaa393fc060deeb28f862cfd60654..97772f71272b93b85c44013881c566d3a8f1e7cb 100755 GIT binary patch delta 20 bcmbOvFiBuT5ep;3h($ delta 20 ccmZ23wOne$aZbj#$tO5n8RItdaY-@*08ar1Q2+n{ diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape index 6ed796897f4042479032c74fa96fdb0eee44939f..695a033ee0373d37151e6c00818bffd520b24c49 100755 GIT binary patch delta 20 bcmdlWv_WV?9~&dXMMpyMO!Nld diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 602df9cd6052870218b42d3e70152c11be896023..9a5b39605f58864c0cc037279868a5a437a7307a 100755 GIT binary patch delta 20 ccmdliuvuWkR8~fY$z>% diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 6dbc60c5a51548a491d928ad98c399464b1ecef7..df8a0ec7de37777e5b20ecbbd819931c10cd27d7 100755 GIT binary patch delta 20 ccmaDW{8o6w6gEbN$y3=}85uU;W)ort08gg|X#fBK delta 20 ccmaDW{8o6w6gI}V$y3=}8RItJW)ort09Hc>B>(^b diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index 21013b36cd3a17795b73d264785003572f25eb5e..45ff1755f31c727c4fb01a6ceb5d619afb70f9f0 100755 GIT binary patch delta 37 kcmaDY@mgZT4OT{m$v0VD85uUqvzf6Var7A{pXOcw0OmFeCjbBd delta 37 kcmaDY@mgZT4OYgu$v0VD8RIs~vzf6Var7A{pXOcw00QX@p8x;= diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 9ee99589504d999fccd935ec4b056e07ac8d3de9..5d1762c1381879a88593ddb9675a11612cfae9b1 100755 GIT binary patch delta 20 ccmX@hcb0F%S!PCt$>*3|85uTPx# delta 20 ccmX@hcb0F%S!Tw#$>*3|8RIsKuvjt!08>W>r2qf` diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 76372a363c5734810819a3a41b61c894c3c1831c..c9dba179001b928760e13778763c12ca1b1eb15a 100755 GIT binary patch delta 20 bcmX>kdPsDGJUb)9WCeCtMuyF4>@my$Jo*I% delta 20 bcmX>kdPsDGJUe6DWCeCt#<@my$LzV@> diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index 53a259889b2dd9a9c29b0ed8c5578267ac6cc322..3d31a2bad19335bcad01ae723cf51dc44be6b01e 100755 GIT binary patch delta 20 bcmeCdod<_k;!MKuPv diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index bf55e1ae8ce35b13a6636f6f6f9ce3c8f914060e..cb10f73143d3b363cea8eb35ab3d4c3c11125735 100755 GIT binary patch delta 20 bcmZqYZ|C2j$im1lS&7A!kzsQNi##&`GSUP? delta 20 bcmZqYZ|C2j$if&mS&7A!F>Z4Pi##&`Ic^01 diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index c98ab3805516e6d8a8fea412758d7062f0922661..9b7fa3faa2fd1755c0f445f679183feb583c5bdd 100755 GIT binary patch delta 20 ccmbQvGo5F{ZDvM>$#t<8 delta 20 ccmbQvGo5F{ZDz)}$#Xc5@3oQ08L@(LDLMuyGrSj3nCL7)Z5 delta 20 bcmZn>Xc5@3oP{xN@(LDL#<fF;+%~$;Vk;85uV7vWYSS07d!*XaE2J delta 20 ccmZ1^v`A>fF;>R7$;Vk;8RItdvWYSS08Ew!Bme*a diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 1a8013346198dbecb70ad78697c494f936e4a532..adef8e4d1e838c5aa437679d7b79966fc7689829 100755 GIT binary patch delta 20 bcmX@Wdw_RCIx{1~$xm5a85uTfvwmd+07@tZkpKVy delta 20 ccmZ3$w}5ZM6Bfp}$xm5a8RIr