From eaaa933b1215f409038adaf01800fefd405d07a2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 1 Nov 2012 13:05:26 -0400
Subject: Fixed inversion of category-group pairs from Connector plugins in
 ClientMetadata.categories

---
 .../Testlib/TestServer/TestPlugins/TestMetadata.py      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index 1d4459745..430368238 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -84,6 +84,7 @@ def get_groups_test_tree():
       <Group name="group10"/>
     </Group>
   </Group>
+  <Group name="group12" category="category3" public="false"/>
 </Groups>''').getroottree()
 
 
@@ -836,7 +837,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
         self.assertItemsEqual([g.name
                                for g in metadata.negated_groups.values()],
                               negated_groups)
-        
+
     @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.load_xml", Mock())
     def test_set_profile(self):
         metadata = self.get_obj()
@@ -1015,7 +1016,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
 
     @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.load_xml", Mock())
     def test_merge_groups(self):
-        metadata = self.get_obj()        
+        metadata = self.get_obj()
         self.load_groups_data(metadata=metadata)
         self.load_clients_data(metadata=metadata)
 
@@ -1090,6 +1091,13 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
         self.assertEqual(imd.groups, oldgroups.union(["group7"]))
         self.assertEqual(imd.bundles, oldbundles.union(["bundle3"]))
 
+        # test adding groups with categories
+        oldgroups = imd.groups
+        metadata.merge_additional_groups(imd, ["group12"])
+        self.assertEqual(imd.groups, oldgroups.union(["group12"]))
+        self.assertIn("category3", imd.categories)
+        self.assertEqual(imd.categories["category3"], "group12")
+
         # test adding multiple groups
         imd = metadata.get_initial_metadata("client2")
         oldgroups = imd.groups
@@ -1103,7 +1111,6 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
         metadata.merge_additional_groups(imd, ["group6", "newgroup"])
         self.assertItemsEqual(imd.groups,
                               oldgroups.union(["group6", "newgroup"]))
-        
 
     @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.load_xml", Mock())
     def test_merge_additional_data(self):
@@ -1264,7 +1271,7 @@ class TestMetadataBase(TestMetadata):
         core.fam.AddMonitor.assert_called_once_with(os.path.join(metadata.data,
                                                                  "groups.xml"),
                                                     metadata)
-        
+
         mock_exists.return_value = True
         core.fam.reset_mock()
         metadata = self.get_obj(core=core, watch_clients=True)
@@ -1274,7 +1281,7 @@ class TestMetadataBase(TestMetadata):
         core.fam.AddMonitor.assert_any_call(os.path.join(metadata.data,
                                                          "clients.xml"),
                                             metadata)
-    
+
     def test_add_group(self):
         pass
 
-- 
cgit v1.2.3-1-g7c22