diff --git a/tests/test_modules.py b/tests/test_modules.py index 6a67353..4b280a3 100644 --- a/tests/test_modules.py +++ b/tests/test_modules.py @@ -16,17 +16,27 @@ class TestGenericModules(unittest.TestCase): engine.input = mock.Mock() config = Config() self.objects = {} + + self.popen = mocks.MockPopen() + self.popen.mock.communicate.return_value = (str.encode("1"), "error") + self.popen.mock.returncode = 0 + + self._platform = mock.patch("bumblebee.modules.kernel.platform") + self.platform = self._platform.start() + self.platform.release.return_value = "unknown linux v1" + for mod in all_modules(): - cls = importlib.import_module("bumblebee.modules.{}".format(mod["name"])) + name = "bumblebee.modules.{}".format(mod["name"]) + cls = importlib.import_module(name) self.objects[mod["name"]] = getattr(cls, "Module")(engine, {"config": config}) for widget in self.objects[mod["name"]].widgets(): self.assertEquals(widget.get("variable", None), None) - def test_widgets(self): - popen = mocks.MockPopen() - popen.mock.communicate.return_value = (str.encode("1"), "error") - popen.mock.returncode = 0 + def tearDown(self): + self._platform.stop() + self.popen.cleanup() + def test_widgets(self): for mod in self.objects: widgets = self.objects[mod].widgets() for widget in widgets: @@ -37,17 +47,12 @@ class TestGenericModules(unittest.TestCase): widget.set("variable", "value") self.assertEquals(widget.get("variable", None), "value") self.assertTrue(isinstance(widget.full_text(), str) or isinstance(widget.full_text(), unicode)) - popen.cleanup() def test_update(self): - popen = mocks.MockPopen() - popen.mock.communicate.return_value = (str.encode("1"), "error") - popen.mock.returncode = 0 for mod in self.objects: widgets = self.objects[mod].widgets() self.objects[mod].update(widgets) self.test_widgets() self.assertEquals(widgets, self.objects[mod].widgets()) - popen.cleanup() # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4