summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-24 11:12:10 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-24 11:12:10 -0400
commit3956133f14f9d832a665a7fb5f42d3f299d325d3 (patch)
tree8c6887a83f22c2929b79ebff7bf62fc9493f3e83 /testsuite
parent0e88362fb001dd2f5cffd81126e842cd77f278de (diff)
downloadbcfg2-3956133f14f9d832a665a7fb5f42d3f299d325d3.tar.gz
bcfg2-3956133f14f9d832a665a7fb5f42d3f299d325d3.tar.bz2
bcfg2-3956133f14f9d832a665a7fb5f42d3f299d325d3.zip
added some basic plugin interface tests to allow inheritance and forward-compat for future tests
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugin.py17
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py8
2 files changed, 23 insertions, 2 deletions
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()