rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Sep 13 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-7

Browse Source 
- added test for metadata of fence_watchdog & fence_dummy
This commit is contained in:
Klaus Wenninger 2021-09-13 14:58:48 +02:00
parent 6470742ce3
commit 699ee17e93
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0006-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch Normal file
View File

@ -0,0 +1,45 @@
From 2f3d1e1f960e89481cc4088832b8f76a5fc6d376 Mon Sep 17 00:00:00 2001
From: Klaus Wenninger <klaus.wenninger@aon.at>
Date: Thu, 19 Aug 2021 17:02:16 +0200
Subject: [PATCH] Test: cts-fencing: check metadata from fence_dummy/watchdog
xml gotten via stonith_admin has actual metadata just embedded
and thus is always valid xml even if metadata itself isn't.
---
cts/cts-fencing.in | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in
index 942e607..0bedd9a 100644
--- a/cts/cts-fencing.in
+++ b/cts/cts-fencing.in
@@ -1442,6 +1442,18 @@ class Tests(object):
"Run stonith_admin --metadata for the fence_dummy agent", 1)
test.add_cmd_check_stdout("stonith_admin", "--output-as=xml -a fence_dummy --metadata", '<shortdesc lang')
+ def build_metadata_tests(self):
+ """ run fence-agents coming with pacemaker with -o metadata and check for valid xml """
+
+ test = self.new_test("check_metadata_dummy",
+ "Run fence_dummy -o metadata and check for valid xml", 0)
+ test.add_cmd("fence_dummy", "-o metadata", check_rng=False, check_stderr=False)
+ # fence_dummy prints on stderr to check that tools just listen on stdout
+
+ test = self.new_test("check_metadata_watchdog",
+ "Run fence_watchdog -o metadata and check for valid xml", 0)
+ test.add_cmd("fence_watchdog", "-o metadata", check_rng=False)
+
def setup_environment(self, use_corosync):
""" Prepare the host before executing any tests """
@@ -1571,6 +1583,7 @@ def main(argv):
tests.build_nodeid_tests()
tests.build_remap_tests()
tests.build_query_tests()
+ tests.build_metadata_tests()
if opts.options['list-tests']:
tests.print_list()
--
1.8.3.1

6
pacemaker.spec
View File

@ -32,7 +32,7 @@
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
%global pcmkversion 2.1.1
%global specversion 6
%global specversion 7
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit 77db57872790c73e44ee7f49005d3ee1dded652e
@ -220,6 +220,7 @@ Patch1: 0002-Fix-watchdog-fencing-Silence-warning-without-node-re.patch
Patch2: 0003-Fix-fence_watchdog-fix-version-output-needed-for-hel.patch
Patch3: 0004-Build-rpm-package-fence_watchdog-in-base-package.patch
Patch6: 0005-Fix-fence_watchdog-fix-malformed-xml-in-metadata.patch
Patch7: 0006-Test-cts-fencing-check-metadata-from-fence_dummy-wat.patch
# upstream commits
@ -828,6 +829,9 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* Mon Sep 13 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-7
- added test for metadata of fence_watchdog & fence_dummy
* Mon Sep 13 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-6
- Update for new upstream release tarball: Pacemaker-2.1.1
for full details, see included ChangeLog file or