From 50ec9f3740f3d36fa77f2cecb5f28efc06061ce7 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 9 Mar 2008 21:13:17 +0000 Subject: [PATCH] Fix regexwhere test git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6568 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/crypto-bacula-fd.conf.in | 2 +- regress/scripts/test-bacula-fd.conf.in | 2 +- regress/scripts/tls-auth-bacula-fd.conf.in | 2 +- regress/scripts/tls-bacula-fd.conf.in | 2 +- regress/scripts/win32-bacula-fd.conf.in | 2 +- regress/tests/four-concurrent-jobs-test | 1 + regress/tests/four-jobs-1t1d-tape | 4 ++-- regress/tests/four-jobs-test | 4 ++-- regress/tests/regexwhere-test | 10 ++++++++++ regress/tests/two-jobs-test | 4 ++-- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/regress/scripts/crypto-bacula-fd.conf.in b/regress/scripts/crypto-bacula-fd.conf.in index 540bc107bf..607c65d8f0 100644 --- a/regress/scripts/crypto-bacula-fd.conf.in +++ b/regress/scripts/crypto-bacula-fd.conf.in @@ -33,5 +33,5 @@ FileDaemon { # this is me # Send all messages except skipped files back to Director Messages { Name = Standard - director = @hostname@-dir = all, !terminate + director = @hostname@-dir = all, !terminate, !restored } diff --git a/regress/scripts/test-bacula-fd.conf.in b/regress/scripts/test-bacula-fd.conf.in index 47c44998da..6c3c439eef 100644 --- a/regress/scripts/test-bacula-fd.conf.in +++ b/regress/scripts/test-bacula-fd.conf.in @@ -29,5 +29,5 @@ FileDaemon { # this is me # Send all messages except skipped files back to Director Messages { Name = Standard - director = @hostname@-dir = all, !terminate + director = @hostname@-dir = all, !terminate, !restored } diff --git a/regress/scripts/tls-auth-bacula-fd.conf.in b/regress/scripts/tls-auth-bacula-fd.conf.in index 225064156c..582044e5a1 100644 --- a/regress/scripts/tls-auth-bacula-fd.conf.in +++ b/regress/scripts/tls-auth-bacula-fd.conf.in @@ -39,5 +39,5 @@ FileDaemon { # this is me # Send all messages except skipped files back to Director Messages { Name = Standard - director = @hostname@-dir = all, !terminate + director = @hostname@-dir = all, !terminate, !restored } diff --git a/regress/scripts/tls-bacula-fd.conf.in b/regress/scripts/tls-bacula-fd.conf.in index c489a0e536..2f3e53f50e 100644 --- a/regress/scripts/tls-bacula-fd.conf.in +++ b/regress/scripts/tls-bacula-fd.conf.in @@ -37,5 +37,5 @@ FileDaemon { # this is me # Send all messages except skipped files back to Director Messages { Name = Standard - director = @hostname@-dir = all, !terminate + director = @hostname@-dir = all, !terminate, !restored } diff --git a/regress/scripts/win32-bacula-fd.conf.in b/regress/scripts/win32-bacula-fd.conf.in index 115b83d0e7..2d834e0f91 100644 --- a/regress/scripts/win32-bacula-fd.conf.in +++ b/regress/scripts/win32-bacula-fd.conf.in @@ -29,5 +29,5 @@ FileDaemon { # this is me # Send all messages except skipped files back to Director Messages { Name = Standard - director = rufus-dir = all, !terminate + director = rufus-dir = all, !terminate, !restored } diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index 5190dfce6d..80a3fcc691 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -77,6 +77,7 @@ unmark * mark * done yes +run job=$JobName level=Full Storage=File1 yes wait reload reload diff --git a/regress/tests/four-jobs-1t1d-tape b/regress/tests/four-jobs-1t1d-tape index 3212e4ca27..2a912e2f9f 100755 --- a/regress/tests/four-jobs-1t1d-tape +++ b/regress/tests/four-jobs-1t1d-tape @@ -18,8 +18,8 @@ start_test cat <${cwd}/tmp/bconcmds @$out /dev/null estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing +estimate job=$JobName +estimate job=$JobName messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 9af909d8b8..b13a3ddd93 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -18,8 +18,8 @@ start_test cat <${cwd}/tmp/bconcmds @output /dev/null estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing +estimate job=$JobName +estimate job=$JobName messages @$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test index 692bd60b36..eaaa3fe6fa 100755 --- a/regress/tests/regexwhere-test +++ b/regress/tests/regexwhere-test @@ -13,6 +13,16 @@ scripts/copy-test-confs /bin/cp -f scripts/bacula-dir.conf.regexwhere bin/bacula-dir.conf +# +# Remove the !restored from the messages resource because +# this test needs the restored listing to verify the +# restore results +# +outf="${cwd}/tmp/sed_tmp" +echo "s%, \!restored%%g" >${outf} +cp ${cwd}/bin/bacula-fd.conf ${cwd}/tmp/1 +sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-fd.conf + echo "${cwd}/build/po" >tmp/file-list start_test diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 4f1fdabdcd..be9501bf7c 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -21,8 +21,8 @@ setdebug level=15 storage=File messages @output/dev/null estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing +estimate job=$JobName +estimate job=$JobName messages @$out tmp/log1.out label storage=File volume=TestVolume001 -- 2.39.5