Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

3 files changed, 30 insertions, 54 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
index f01082e86..c2c6c5d4c 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
@@ -49,7 +49,6 @@ class TestPOSIX(TestTool):
         mock_canVerify.assert_called_with(posix, entry)
 
         # next, test fully_specified failure
-        posix.logger.error.reset_mock()
         mock_canVerify.reset_mock()
         mock_canVerify.return_value = True
         mock_fully_spec = Mock()
@@ -59,17 +58,14 @@ class TestPOSIX(TestTool):
         self.assertFalse(posix.canVerify(entry))
         mock_canVerify.assert_called_with(posix, entry)
         mock_fully_spec.assert_called_with(entry)
-        self.assertTrue(posix.logger.error.called)
 
         # finally, test success
-        posix.logger.error.reset_mock()
         mock_canVerify.reset_mock()
         mock_fully_spec.reset_mock()
         mock_fully_spec.return_value = True
         self.assertTrue(posix.canVerify(entry))
         mock_canVerify.assert_called_with(posix, entry)
         mock_fully_spec.assert_called_with(entry)
-        self.assertFalse(posix.logger.error.called)
 
     @patch("Bcfg2.Client.Tools.Tool.canInstall")
     def test_canInstall(self, mock_canInstall):
@@ -82,7 +78,6 @@ class TestPOSIX(TestTool):
         mock_canInstall.assert_called_with(posix, entry)
 
         # next, test fully_specified failure
-        posix.logger.error.reset_mock()
         mock_canInstall.reset_mock()
         mock_canInstall.return_value = True
         mock_fully_spec = Mock()
@@ -92,17 +87,14 @@ class TestPOSIX(TestTool):
         self.assertFalse(posix.canInstall(entry))
         mock_canInstall.assert_called_with(posix, entry)
         mock_fully_spec.assert_called_with(entry)
-        self.assertTrue(posix.logger.error.called)
 
         # finally, test success
-        posix.logger.error.reset_mock()
         mock_canInstall.reset_mock()
         mock_fully_spec.reset_mock()
         mock_fully_spec.return_value = True
         self.assertTrue(posix.canInstall(entry))
         mock_canInstall.assert_called_with(posix, entry)
         mock_fully_spec.assert_called_with(entry)
-        self.assertFalse(posix.logger.error.called)
 
     def test_InstallPath(self):
         posix = self.get_obj()
@@ -152,7 +144,6 @@ class TestPOSIX(TestTool):
         def inner(mock_listdir):
             mock_listdir.side_effect = OSError
             posix._prune_old_backups(entry)
-            self.assertTrue(posix.logger.error.called)
             self.assertFalse(mock_remove.called)
             mock_listdir.assert_called_with(setup['ppath'])
 
@@ -170,7 +161,6 @@ class TestPOSIX(TestTool):
             mock_listdir.reset_mock()
             mock_remove.reset_mock()
             mock_remove.side_effect = OSError
-            posix.logger.error.reset_mock()
             # test to ensure that we call os.remove() for all files that
             # need to be removed even if we get an error
             posix._prune_old_backups(entry)
@@ -178,7 +168,6 @@ class TestPOSIX(TestTool):
             self.assertItemsEqual(mock_remove.call_args_list,
                                   [call(os.path.join(setup['ppath'], p))
                                    for p in remove])
-            self.assertTrue(posix.logger.error.called)
 
         inner()
 
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
index 4fcd63a60..211c39732 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
@@ -24,11 +24,11 @@ from TestTools.Test_init import TestTool
 class TestPOSIXUsers(TestTool):
     test_obj = POSIXUsers
 
-    def get_obj(self, logger=None, setup=None, config=None):
+    def get_obj(self, setup=None, config=None):
         if setup is None:
             setup = MagicMock()
             setup.__getitem__.return_value = []
-        return TestTool.get_obj(self, logger, setup, config)
+        return TestTool.get_obj(self, setup, config)
 
     @patch("pwd.getpwall")
     @patch("grp.getgrall")
@@ -134,10 +134,9 @@ class TestPOSIXUsers(TestTool):
         users.set_defaults['POSIXUser'] = Mock()
         users.set_defaults['POSIXUser'].side_effect = lambda e: e
 
-        states = dict()
-        self.assertEqual(users.Inventory(states),
+        self.assertEqual(users.Inventory(),
                          mock_Inventory.return_value)
-        mock_Inventory.assert_called_with(users, states, config.getchildren())
+        mock_Inventory.assert_called_with(users, config.getchildren())
         lxml.etree.SubElement(orig_bundle, "POSIXGroup", name="test")
         self.assertXMLEqual(orig_bundle, bundle)
 
@@ -301,9 +300,8 @@ class TestPOSIXUsers(TestTool):
         entries = [lxml.etree.Element("POSIXUser", name="test"),
                    lxml.etree.Element("POSIXGroup", name="test"),
                    lxml.etree.Element("POSIXUser", name="test2")]
-        states = dict()
 
-        users.Install(entries, states)
+        states = users.Install(entries)
         self.assertItemsEqual(entries, states.keys())
         for state in states.values():
             self.assertEqual(state, users._install.return_value)
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
index 390b92608..2dc763730 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
@@ -21,24 +21,23 @@ from common import *
 class TestTool(Bcfg2TestCase):
     test_obj = Tool
 
-    def get_obj(self, logger=None, setup=None, config=None):
+    def get_obj(self, setup=None, config=None):
         if config is None:
             config = lxml.etree.Element("Configuration")
-        if not logger:
-            def print_msg(msg):
-                print(msg)
-            logger = Mock()
-            logger.error = Mock(side_effect=print_msg)
-            logger.warning = Mock(side_effect=print_msg)
-            logger.info = Mock(side_effect=print_msg)
-            logger.debug = Mock(side_effect=print_msg)
         if not setup:
             setup = MagicMock()
         if 'command_timeout' not in setup:
             setup['command_timeout'] = None
+
         execs = self.test_obj.__execs__
         self.test_obj.__execs__ = []
-        rv = self.test_obj(logger, setup, config)
+
+        @patch("Bcfg2.Options.get_option_parser")
+        def inner(mock_option_parser):
+            mock_option_parser.return_value = setup
+            return self.test_obj(config)
+
+        rv = inner()
         self.test_obj.__execs__ = execs
         return rv
 
@@ -166,14 +165,12 @@ class TestTool(Bcfg2TestCase):
             self.assertItemsEqual(states, expected_states)
             self.assertEqual(t.extra, t.FindExtra.return_value)
 
-        actual_states = dict()
-        t.Inventory(actual_states, structures=[bundle1, bundle2])
+        actual_states = t.Inventory(structures=[bundle1, bundle2])
         perform_assertions(actual_states)
 
         reset()
-        actual_states = dict()
         t.config = config
-        t.Inventory(actual_states)
+        actual_states = t.Inventory()
         perform_assertions(actual_states)
 
     def test_Install(self):
@@ -199,9 +196,8 @@ class TestTool(Bcfg2TestCase):
         expected_states.update(dict([(e, t.InstallService.return_value)
                                      for e in entries if e.tag == "Service"]))
 
-        actual_states = dict()
         t.modified = []
-        t.Install(entries, actual_states)
+        actual_states = t.Install(entries)
         self.assertItemsEqual(t.InstallPath.call_args_list,
                               [call(e) for e in entries if e.tag == "Path"])
         self.assertItemsEqual(t.InstallPackage.call_args_list,
@@ -385,8 +381,7 @@ class TestPkgTool(TestTool):
         # test single-pass install success
         reset()
         pt.cmd.run.return_value = True
-        states = dict([(p, False) for p in packages])
-        pt.Install(packages, states)
+        states = pt.Install(packages)
         pt._get_package_command.assert_called_with(packages)
         pt.cmd.run.assert_called_with([p.get("name") for p in packages])
         self.assertItemsEqual(states,
@@ -406,8 +401,7 @@ class TestPkgTool(TestTool):
         pt.VerifyPackage.side_effect = lambda p, m: p.get("name") == "bar"
 
         pt.cmd.run.side_effect = run
-        states = dict([(p, False) for p in packages])
-        pt.Install(packages, states)
+        states = pt.Install(packages)
         pt._get_package_command.assert_any_call(packages)
         for pkg in packages:
             pt.VerifyPackage.assert_any_call(pkg, [])
@@ -526,14 +520,14 @@ class TestSvcTool(TestTool):
             st.get_svc_command.reset_mock()
             st.cmd.reset_mock()
 
-        st.cmd.run.return_value = True
-        self.assertEqual(st.check_service(service), True)
+        self.assertEqual(st.check_service(service),
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "status")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
         reset()
-        st.cmd.run.return_value = False
-        self.assertEqual(st.check_service(service), False)
+        self.assertEqual(st.check_service(service),
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "status")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
@@ -556,10 +550,9 @@ class TestSvcTool(TestTool):
         st.handlesEntry = Mock()
         st.handlesEntry.side_effect = lambda e: e.tag == "Service"
         st.stop_service = Mock()
-        st.stop_service.return_value = 0
+        st.stop_service.return_value = True
         st.restart_service = Mock()
-        st.restart_service.side_effect = lambda e: \
-            int(e.get("name") != "failed")
+        st.restart_service.side_effect = lambda e: e.get("name") != "failed"
 
         def reset():
             st.handlesEntry.reset_mock()
@@ -593,8 +586,7 @@ class TestSvcTool(TestTool):
 
         # test in non-interactive mode
         reset()
-        states = dict()
-        st.BundleUpdated(bundle, states)
+        states = st.BundleUpdated(bundle)
         self.assertItemsEqual(st.handlesEntry.call_args_list,
                               [call(e) for e in entries])
         st.stop_service.assert_called_with(stop)
@@ -607,8 +599,7 @@ class TestSvcTool(TestTool):
         reset()
         mock_prompt.side_effect = lambda p: "interactive2" not in p
         st.setup['interactive'] = True
-        states = dict()
-        st.BundleUpdated(bundle, states)
+        states = st.BundleUpdated(bundle)
         self.assertItemsEqual(st.handlesEntry.call_args_list,
                               [call(e) for e in entries])
         st.stop_service.assert_called_with(stop)
@@ -622,8 +613,7 @@ class TestSvcTool(TestTool):
         reset()
         st.setup['interactive'] = False
         st.setup['servicemode'] = 'build'
-        states = dict()
-        st.BundleUpdated(bundle, states)
+        states = st.BundleUpdated(bundle)
         self.assertItemsEqual(st.handlesEntry.call_args_list,
                               [call(e) for e in entries])
         self.assertItemsEqual(st.stop_service.call_args_list,
@@ -639,10 +629,9 @@ class TestSvcTool(TestTool):
         services = install + [lxml.etree.Element("Service", type="test",
                                                  name="bar", install="false")]
         st = self.get_obj()
-        states = Mock()
-        self.assertEqual(st.Install(services, states),
+        self.assertEqual(st.Install(services),
                          mock_Install.return_value)
-        mock_Install.assert_called_with(st, install, states)
+        mock_Install.assert_called_with(st, install)
 
     def test_InstallService(self):
         st = self.get_obj()