diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-15 13:48:26 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-15 13:48:28 -0400 |
commit | 435d173f493bf8b1c5d71abef94ba9733d22839e (patch) | |
tree | 9f0a92b73df112e202ea73a9fa79f295a315f533 /testsuite | |
parent | 4afe2a1b06823032b588d932e2dc9c0a9c95809e (diff) | |
download | bcfg2-435d173f493bf8b1c5d71abef94ba9733d22839e.tar.gz bcfg2-435d173f493bf8b1c5d71abef94ba9733d22839e.tar.bz2 bcfg2-435d173f493bf8b1c5d71abef94ba9733d22839e.zip |
Metadata: search groups breadth-first when building metadata
This makes category negation consistent, and also makes it work like
it did in Bcfg2 1.2
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py index 32c893548..e839914d7 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -830,21 +830,18 @@ class TestMetadata(_TestMetadata, TestClientRunHooks, TestDatabaseBacked): self.assertEqual(metadata.groups['group4'].category, 'category1') self.assertEqual(metadata.default, "group1") - all_groups = [] - negated_groups = [] + all_groups = set() + negated_groups = set() for group in get_groups_test_tree().xpath("//Groups/Client//*") + \ get_groups_test_tree().xpath("//Groups/Group//*"): if group.tag == 'Group' and not group.getchildren(): if group.get("negate", "false").lower() == 'true': - negated_groups.append(group.get("name")) + negated_groups.add(group.get("name")) else: - all_groups.append(group.get("name")) - self.assertItemsEqual([g.name - for g in metadata.group_membership.values()], - all_groups) - self.assertItemsEqual([g.name - for g in metadata.negated_groups.values()], - negated_groups) + all_groups.add(group.get("name")) + self.assertItemsEqual(metadata.ordered_groups, all_groups) + self.assertItemsEqual(metadata.group_membership.keys(), all_groups) + self.assertItemsEqual(metadata.negated_groups.keys(), negated_groups) @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.load_xml", Mock()) def test_set_profile(self): |