Merge branch 'maint'

Conflicts:
	doc/appendix/files/mysql.txt
	doc/getting_started/index.txt
	doc/server/plugins/structures/bundler/kernel.txt
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/interfaces.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py

7 files changed, 14 insertions, 14 deletions

diff --git a/testsuite/Testschema/test_schema.py b/testsuite/Testschema/test_schema.py
index ddfe4775f..cd9b74cdf 100644
--- a/testsuite/Testschema/test_schema.py
+++ b/testsuite/Testschema/test_schema.py
@@ -41,7 +41,7 @@ class TestSchemas(Bcfg2TestCase):
         xmllint = Popen(['xmllint', '--xinclude', '--noout', '--schema',
                          self.schema_url] + schemas,
                         stdout=PIPE, stderr=STDOUT)
-        print(xmllint.communicate()[0])
+        print(xmllint.communicate()[0].decode())
         self.assertEqual(xmllint.wait(), 0)
 
     def test_duplicates(self):
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
index e0406fd92..8e7b58d30 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
@@ -1009,7 +1009,7 @@ class TestPOSIXTool(TestTool):
             else:
                 return True
         ptool._set_perms.side_effect = set_perms_rv
-        self.assertFalse(ptool._makedirs(entry))
+        self.assertTrue(ptool._makedirs(entry))
         self.assertItemsEqual(mock_exists.call_args_list,
                               [call("/test"), call("/test/foo"),
                                call("/test/foo/bar")])
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
index e26c26d41..870983f60 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
@@ -29,16 +29,11 @@ class TestDebuggable(Bcfg2TestCase):
 
     def test_set_debug(self):
         d = self.get_obj()
-        d.debug_log = Mock()
         self.assertEqual(True, d.set_debug(True))
         self.assertEqual(d.debug_flag, True)
-        self.assertTrue(d.debug_log.called)
-
-        d.debug_log.reset_mock()
 
         self.assertEqual(False, d.set_debug(False))
         self.assertEqual(d.debug_flag, False)
-        self.assertTrue(d.debug_log.called)
 
     def test_toggle_debug(self):
         d = self.get_obj()
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index 13c27c149..90f592eb2 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -895,10 +895,13 @@ class TestMetadata(_TestMetadata, TestClientRunHooks, TestDatabaseBacked):
         metadata = self.load_clients_data(metadata=self.load_groups_data())
         if not metadata._use_db:
             metadata.clients_xml.write = Mock()
+            metadata.core.build_metadata = Mock()
+            metadata.core.build_metadata.side_effect = \
+                lambda c: metadata.get_initial_metadata(c)
+
             metadata.set_profile("client1", "group2", None)
             mock_update_client.assert_called_with("client1",
                                                   dict(profile="group2"))
-            metadata.clients_xml.write.assert_any_call()
             self.assertEqual(metadata.clientgroups["client1"], ["group2"])
 
             metadata.clients_xml.write.reset_mock()
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
index 30b08ef2f..f44bc338c 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
@@ -461,7 +461,7 @@ text
     def test_load_data_db(self):
         probes = self.get_probes_object(use_db=True)
         probes.load_data()
-        probes._load_data_db.assert_any_call()
+        probes._load_data_db.assert_any_call(client=None)
         self.assertFalse(probes._load_data_xml.called)
 
     @patch("lxml.etree.parse")
diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py
index 415b316fd..87b63a6ab 100644
--- a/testsuite/Testsrc/test_code_checks.py
+++ b/testsuite/Testsrc/test_code_checks.py
@@ -70,7 +70,9 @@ no_checks = {
     "lib/Bcfg2/Server/Reports": ["manage.py"],
     "lib/Bcfg2/Server/Plugins": ["Base.py"],
     }
-
+if sys.version_info > (2, 5):
+    # multiprocessing core requires py2.6
+    no_checks['lib/Bcfg2/Server'].append('MultiprocessingCore.py')
 
 try:
     any
@@ -177,7 +179,7 @@ class CodeTestCase(Bcfg2TestCase):
         cmd = self.command + self.full_args + extra_args + \
             [os.path.join(srcpath, f) for f in files]
         proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, env=self.get_env())
-        print(proc.communicate()[0])
+        print(proc.communicate()[0].decode())
         self.assertEqual(proc.wait(), 0)
 
     def _test_errors(self, files, extra_args=None):
@@ -189,7 +191,7 @@ class CodeTestCase(Bcfg2TestCase):
         cmd = self.command + self.error_args + extra_args + \
             [os.path.join(srcpath, f) for f in files]
         proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, env=self.get_env())
-        print(proc.communicate()[0])
+        print(proc.communicate()[0].decode())
         self.assertEqual(proc.wait(), 0)
 
     @skipIf(not os.path.exists(srcpath), "%s does not exist" % srcpath)
@@ -312,7 +314,7 @@ class TestPylint(CodeTestCase):
         args = self.command + self.error_args + extra_args + \
             [os.path.join(srcpath, p) for p in files]
         pylint = Popen(args, stdout=PIPE, stderr=STDOUT, env=self.get_env())
-        output = pylint.communicate()[0]
+        output = pylint.communicate()[0].decode()
         rv = pylint.wait()
 
         for line in output.splitlines():
diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt
index c76466cfe..4733d045c 100644
--- a/testsuite/requirements.txt
+++ b/testsuite/requirements.txt
@@ -2,7 +2,7 @@ lxml
 nose
 mock
 sphinx
-pylint
+pylint<1.0
 pep8
 python-daemon
 genshi