Fix regexwhere test

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

diff --git a/regress/scripts/crypto-bacula-fd.conf.in b/regress/scripts/crypto-bacula-fd.conf.in
index 540bc107bf20847b35007be1507128c2dda20394..607c65d8f06a3fd82837ebcc71e1844dce79b91e 100644 (file)
--- 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 47c44998da4953ae89ac5a55963d642f5e2029d3..6c3c439eef5c5c6fe9d027004c1235959ef643c8 100644 (file)
--- 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 225064156ca92df4c545c7e4c4d59acea76e1e30..582044e5a146b9b48c70ba26a028b2d34f865d8b 100644 (file)
--- 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 c489a0e53612a1e57bf5fbb90bb49e19d4ca0a90..2f3e53f50eac146f30d464e93cc6834ea982b01d 100644 (file)
--- 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 115b83d0e75a81cb24089c7d3e67374aff8611ad..2d834e0f9101ba6c000d8ad4c5259b370ca1be5f 100644 (file)
--- 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 5190dfce6df18112f8931c34e17f0652ef17a877..80a3fcc691895006f95bb081107346565435145d 100755 (executable)
--- 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 3212e4ca275f059cd4fa5fba5bc2ee4a470eb44f..2a912e2f9f4a3be97c75964c6d4708e187847f4e 100755 (executable)
--- a/regress/tests/four-jobs-1t1d-tape
+++ b/regress/tests/four-jobs-1t1d-tape
@@ -18,8 +18,8 @@ start_test
 cat <<END_OF_DATA >${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 9af909d8b81b948ce974e598105a6b51cf02911a..b13a3ddd930e20ecbcdea2a35625640d1eb22ca3 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -18,8 +18,8 @@ start_test
 cat <<END_OF_DATA >${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 692bd60b3670e68199d04904710fc808baf0a10e..eaaa3fe6faf16e9986c0cc0545b269e78c99e774 100755 (executable)
--- 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 4f1fdabdcd1ff7f50bcd8b039304cf1682308201..be9501bf7c2febfbf8c63ce9ef9f6f1e75d83e3f 100755 (executable)
--- 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