diff options
Diffstat (limited to 'testsuite/Testsrc')
4 files changed, 22 insertions, 12 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index 8a1d5a949..df55e2bf3 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -87,7 +87,7 @@ class TestDatabaseBacked(TestPlugin): core.setup.cfp.getboolean.return_value = False db = self.get_obj(core) self.assertFalse(db._use_db) - + Bcfg2.Server.Plugin.helpers.HAS_DJANGO = False core = Mock() db = self.get_obj(core) @@ -1764,6 +1764,17 @@ class TestGroupSpool(TestPlugin, TestGenerator): test_obj = GroupSpool def get_obj(self, core=None): + if core is None: + print "creating core as a magicmock" + core = MagicMock() + core.setup = MagicMock() + else: + try: + core.setup['encoding'] + except TypeError: + print "creating core.setup.__getitem__" + core.setup.__getitem__ = MagicMock() + @patch("%s.%s.AddDirectoryMonitor" % (self.test_obj.__module__, self.test_obj.__name__), Mock()) @@ -1773,11 +1784,10 @@ class TestGroupSpool(TestPlugin, TestGenerator): return inner() def test__init(self): - core = Mock() @patch("%s.%s.AddDirectoryMonitor" % (self.test_obj.__module__, self.test_obj.__name__)) def inner(mock_Add): - gs = self.test_obj(core, datastore) + gs = self.test_obj(MagicMock(), datastore) mock_Add.assert_called_with('') self.assertItemsEqual(gs.Entries, {gs.entry_type: {}}) @@ -1792,7 +1802,7 @@ class TestGroupSpool(TestPlugin, TestGenerator): gs.event_id = Mock() gs.event_path = Mock() gs.AddDirectoryMonitor = Mock() - + def reset(): gs.es_cls.reset_mock() gs.es_child_cls.reset_mock() diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py index 5610d9071..38f4f2161 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -90,6 +90,7 @@ def get_groups_test_tree(): def get_metadata_object(core=None, watch_clients=False, use_db=False): if core is None: core = Mock() + core.setup = MagicMock() core.metadata_cache = MagicMock() core.setup.cfp.getboolean = Mock(return_value=use_db) return Metadata(core, datastore, watch_clients=watch_clients) @@ -248,7 +249,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked): self.assertEqual(config.base_xdata, "<test/>") def test_add_monitor(self): - core = Mock() + core = MagicMock() config = self.get_obj(core=core) fname = "test.xml" @@ -441,7 +442,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked): def test__init(self): # test with watch_clients=False - core = Mock() + core = MagicMock() metadata = self.get_obj(core=core) self.assertIsInstance(metadata, Bcfg2.Server.Plugin.Plugin) self.assertIsInstance(metadata, Bcfg2.Server.Plugin.Metadata) @@ -452,7 +453,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked): self.assertEqual(metadata.states, dict()) # test with watch_clients=True - core.fam = Mock() + core.fam = MagicMock() metadata = self.get_obj(core=core, watch_clients=True) self.assertEqual(len(metadata.states), 2) core.fam.AddMonitor.assert_any_call(os.path.join(metadata.data, @@ -1206,7 +1207,7 @@ class TestMetadataBase(TestMetadata): @patch('os.path.exists') def test__init(self, mock_exists): - core = Mock() + core = MagicMock() core.fam = Mock() mock_exists.return_value = False metadata = self.get_obj(core=core, watch_clients=True) diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py index a1d41b693..38d3c08e6 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py @@ -201,7 +201,7 @@ class TestProbes(TestProbing, TestConnector, TestDatabaseBacked): def get_obj(self, core=None): if core is None: - core = Mock() + core = MagicMock() return self.test_obj(core, datastore) def get_test_probedata(self): @@ -233,7 +233,7 @@ text "bar.example.com": []} def get_probes_object(self, use_db=False, load_data=None): - core = Mock() + core = MagicMock() core.setup.cfp.getboolean = Mock() core.setup.cfp.getboolean.return_value = use_db if load_data is None: diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index 1d1d271d6..f5a4655ae 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -81,8 +81,7 @@ error_checks = { "RcUpdate.py", "VCS.py", "YUM24.py"], - "lib/Bcfg2/Server/Plugins": ["Decisions.py", - "Deps.py", + "lib/Bcfg2/Server/Plugins": ["Deps.py", "Ldap.py", "Pkgmgr.py"] } |