summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-10 11:47:50 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-10 11:47:50 -0400
commita9a36c9c6802ce70403bfb8b20b076a17d02f99a (patch)
tree0200eb94fea7bd25483e48020c9318232a673b02 /testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
parentd5ed9b3fd3a7f291841fef12e5992706f5d317ca (diff)
downloadbcfg2-a9a36c9c6802ce70403bfb8b20b076a17d02f99a.tar.gz
bcfg2-a9a36c9c6802ce70403bfb8b20b076a17d02f99a.tar.bz2
bcfg2-a9a36c9c6802ce70403bfb8b20b076a17d02f99a.zip
made plugin tests inherit from plugin interface tests
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugins/TestProbes.py')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
index ffc6add26..fc901af68 100644
--- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
+++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
@@ -21,6 +21,8 @@ except ImportError:
import Bcfg2.Server
import Bcfg2.Server.Plugin
from Bcfg2.Server.Plugins.Probes import *
+from ..TestPlugin import TestEntrySet, TestProbing, TestConnector, \
+ TestDatabaseBacked
datastore = "/"
@@ -100,7 +102,7 @@ class TestProbeData(unittest.TestCase):
self.assertItemsEqual(test_data, data.yaml)
-class TestProbeSet(unittest.TestCase):
+class TestProbeSet(TestEntrySet):
def get_probeset_object(self, fam=None):
if fam is None:
fam = Mock()
@@ -196,7 +198,7 @@ group-specific"""
assert False, "Strange probe found in get_probe_data() return"
-class TestProbes(unittest.TestCase):
+class TestProbes(TestProbing, TestConnector, TestDatabaseBacked):
def get_test_probedata(self):
test_xdata = lxml.etree.Element("test")
lxml.etree.SubElement(test_xdata, "test", foo="foo")