From 3956133f14f9d832a665a7fb5f42d3f299d325d3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 24 Aug 2012 11:12:10 -0400 Subject: added some basic plugin interface tests to allow inheritance and forward-compat for future tests --- testsuite/Testlib/TestServer/TestPlugin.py | 17 +++++++++++++++-- testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 8 ++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'testsuite') diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py index f62d6f0f0..d2af78729 100644 --- a/testsuite/Testlib/TestServer/TestPlugin.py +++ b/testsuite/Testlib/TestServer/TestPlugin.py @@ -227,17 +227,28 @@ class TestMetadata(Bcfg2TestCase): class TestConnector(Bcfg2TestCase): """ placeholder """ - pass + def test_get_additional_groups(self): + pass + + def test_get_additional_data(self): + pass class TestProbing(Bcfg2TestCase): """ placeholder """ - pass + def test_GetProbes(self): + pass + + def test_ReceiveData(self): + pass class TestStatistics(TestPlugin): test_obj = Statistics + def test_process_statistics(self): + pass + class TestThreadedStatistics(TestStatistics): test_obj = ThreadedStatistics @@ -395,6 +406,8 @@ class TestThreadedStatistics(TestStatistics): @patch("copy.copy", Mock(side_effect=lambda x: x)) @patch("Bcfg2.Server.Plugin.ThreadedStatistics.run", Mock()) def test_process_statistics(self): + TestStatistics.test_process_statistics(self) + core = Mock() ts = self.get_obj(core) ts.work_queue = Mock() diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py index de9aa1d09..0a971c245 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -460,6 +460,8 @@ text @patch("Bcfg2.Server.Plugins.Probes.ProbeSet.get_probe_data") def test_GetProbes(self, mock_get_probe_data): + TestProbing.test_GetProbes(self) + probes = self.get_probes_object() metadata = Mock() probes.GetProbes(metadata) @@ -468,6 +470,8 @@ text @patch("Bcfg2.Server.Plugins.Probes.Probes.write_data") @patch("Bcfg2.Server.Plugins.Probes.Probes.ReceiveDataItem") def test_ReceiveData(self, mock_ReceiveDataItem, mock_write_data): + TestProbing.test_ReceiveData(self) + # we use a simple (read: bogus) datalist here to make this # easy to test datalist = ["a", "b", "c"] @@ -509,6 +513,8 @@ text self.get_test_cgroups()[cname]) def test_get_additional_groups(self): + TestConnector.test_get_additional_groups(self) + probes = self.get_probes_object() test_cgroups = self.get_test_cgroups() probes.cgroups = self.get_test_cgroups() @@ -524,6 +530,8 @@ text list()) def test_get_additional_data(self): + TestConnector.test_get_additional_data(self) + probes = self.get_probes_object() test_probedata = self.get_test_probedata() probes.probedata = self.get_test_probedata() -- cgit v1.2.3-1-g7c22