made plugin tests inherit from plugin interface tests

6 files changed, 19 insertions, 10 deletions

diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py
index 6a59ad190..a23ef2473 100644
--- a/testsuite/Testlib/TestServer/TestPlugin.py
+++ b/testsuite/Testlib/TestServer/TestPlugin.py
@@ -1043,3 +1043,8 @@ class TestStructFile(TestXMLFileBacked):
         xexpected = lxml.etree.Element("Container")
         xexpected.extend(expected)
         self.assertXMLEqual(xactual, xexpected)
+
+
+
+class TestEntrySet(unittest.TestCase):
+    pass
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
index 24e8f9d75..6926d6eef 100644
--- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -20,10 +20,11 @@ try:
 except ImportError:
     has_django = False
 
-
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugins.Metadata import *
+from ..TestPlugin import TestXMLFileBacked, TestMetadata, TestStatistics, \
+    TestDatabaseBacked
 
 XI_NAMESPACE = "http://www.w3.org/2001/XInclude"
 XI = "{%s}" % XI_NAMESPACE
@@ -194,7 +195,7 @@ class TestClientVersions(unittest.TestCase):
         self.assertIsNone(v[new])
 
 
-class TestXMLMetadataConfig(unittest.TestCase):
+class TestXMLMetadataConfig(TestXMLFileBacked):
     groups_test_tree = groups_test_tree
     clients_test_tree = clients_test_tree
 
@@ -227,14 +228,14 @@ class TestXMLMetadataConfig(unittest.TestCase):
         fpath = os.path.join(self.metadata.data, fname)
 
         config.extras = []
-        config.add_monitor(fpath, fname)
+        config.add_monitor(fpath)
         self.assertFalse(core.fam.AddMonitor.called)
-        self.assertEqual(config.extras, [fname])
+        self.assertEqual(config.extras, [fpath])
 
         config = self.get_config_object(core=core, watch_clients=True)
-        config.add_monitor(fpath, fname)
+        config.add_monitor(fpath)
         core.fam.AddMonitor.assert_called_with(fpath, config.metadata)
-        self.assertItemsEqual(config.extras, [fname])
+        self.assertItemsEqual(config.extras, [fpath])
 
     @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.add_monitor")
     @patch("lxml.etree.parse")
@@ -333,7 +334,8 @@ class TestXMLMetadataConfig(unittest.TestCase):
 
         self.assertEqual(config.find_xml_for_xpath("//boguselement"), dict())
 
-        config.extras = ["foo.xml", "bar.xml", "clients.xml"]
+        config.extras = [os.path.join(self.metadata.data, p)
+                         for p in ["foo.xml", "bar.xml", "clients.xml"]]
 
         def parse_side_effect(fname, parser=Bcfg2.Server.XMLParser):
             if fname == os.path.join(self.metadata.data, "clients.xml"):
@@ -367,7 +369,7 @@ class TestClientMetadata(unittest.TestCase):
         self.assertFalse(cm.inGroup("group3"))
 
 
-class TestMetadata(unittest.TestCase):
+class TestMetadata(TestMetadata, TestStatistics, TestDatabaseBacked):
     groups_test_tree = groups_test_tree
     clients_test_tree = clients_test_tree
     use_db = False
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")
diff --git a/testsuite/Testlib/TestServer/TestPlugins/__init__.py b/testsuite/Testlib/TestServer/TestPlugins/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testsuite/Testlib/TestServer/TestPlugins/__init__.py
diff --git a/testsuite/Testlib/TestServer/__init__.py b/testsuite/Testlib/TestServer/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testsuite/Testlib/TestServer/__init__.py
diff --git a/testsuite/Testlib/__init__.py b/testsuite/Testlib/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testsuite/Testlib/__init__.py