Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/SSLServer.py
	tools/README

2 files changed, 13 insertions, 15 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
index bb7db5e14..5a752b2ac 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
@@ -734,12 +734,13 @@ class TestPOSIXTool(TestTool):
             gather_data_rv[idx] = val
         ptool._gather_data.return_value = tuple(gather_data_rv)
 
+        stat_mode = 17407
         mtime = 1344430414
+        stat_rv = (stat_mode, Mock(), Mock(), Mock(), Mock(), Mock(), Mock(),
+                   Mock(), mtime, Mock())
+        gather_data_rv[0] = stat_rv
         entry = reset()
         entry.set("mtime", str(mtime))
-        stat_rv = MagicMock()
-        stat_rv.__getitem__.return_value = mtime
-        gather_data_rv[0] = stat_rv
         ptool._gather_data.return_value = tuple(gather_data_rv)
         self.assertTrue(ptool._verify_metadata(entry))
         ptool._gather_data.assert_called_with(entry.get("name"))
@@ -811,7 +812,7 @@ class TestPOSIXTool(TestTool):
             ptool._gather_data.assert_called_with(entry.get("name"))
             ptool._verify_acls.assert_called_with(entry,
                                                 path=entry.get("name"))
-            mock_matchpathcon.assert_called_with(entry.get("name"), 0)
+            mock_matchpathcon.assert_called_with(entry.get("name"), stat_mode)
             self.assertEqual(entry.get("current_exists", 'true'), 'true')
             for attr, idx, val in expected:
                 self.assertEqual(entry.get(attr), val)
@@ -826,7 +827,7 @@ class TestPOSIXTool(TestTool):
             ptool._gather_data.assert_called_with(entry.get("name"))
             ptool._verify_acls.assert_called_with(entry,
                                                 path=entry.get("name"))
-            mock_matchpathcon.assert_called_with(entry.get("name"), 0)
+            mock_matchpathcon.assert_called_with(entry.get("name"), stat_mode)
             self.assertEqual(entry.get("current_exists", 'true'), 'true')
             for attr, idx, val in expected:
                 self.assertEqual(entry.get(attr), val)
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index f527bb523..20d752afc 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -831,21 +831,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):