1 files changed, 7 insertions, 47 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
index 870983f60..f135a0197 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import logging
 from mock import Mock, MagicMock, patch
 from Bcfg2.Server.Plugin.base import *
 
@@ -14,62 +13,23 @@ while path != '/':
         break
     path = os.path.dirname(path)
 from common import *
-
-
-class TestDebuggable(Bcfg2TestCase):
-    test_obj = Debuggable
-
-    def get_obj(self):
-        return self.test_obj()
-
-    def test__init(self):
-        d = self.get_obj()
-        self.assertIsInstance(d.logger, logging.Logger)
-        self.assertFalse(d.debug_flag)
-
-    def test_set_debug(self):
-        d = self.get_obj()
-        self.assertEqual(True, d.set_debug(True))
-        self.assertEqual(d.debug_flag, True)
-
-        self.assertEqual(False, d.set_debug(False))
-        self.assertEqual(d.debug_flag, False)
-
-    def test_toggle_debug(self):
-        d = self.get_obj()
-        d.set_debug = Mock()
-        orig = d.debug_flag
-        self.assertEqual(d.toggle_debug(),
-                         d.set_debug.return_value)
-        d.set_debug.assert_called_with(not orig)
-
-    def test_debug_log(self):
-        d = self.get_obj()
-        d.logger = Mock()
-        d.debug_flag = False
-        d.debug_log("test")
-        self.assertFalse(d.logger.error.called)
-
-        d.logger.reset_mock()
-        d.debug_log("test", flag=True)
-        self.assertTrue(d.logger.error.called)
-
-        d.logger.reset_mock()
-        d.debug_flag = True
-        d.debug_log("test")
-        self.assertTrue(d.logger.error.called)
+from TestLogger import TestDebuggable
 
 
 class TestPlugin(TestDebuggable):
     test_obj = Plugin
 
+    def setUp(self):
+        TestDebuggable.setUp(self)
+        set_setup_default("filemonitor", MagicMock())
+
     def get_obj(self, core=None):
         if core is None:
             core = Mock()
-            core.setup = MagicMock()
+
         @patchIf(not isinstance(os.makedirs, Mock), "os.makedirs", Mock())
         def inner():
-            return self.test_obj(core, datastore)
+            return self.test_obj(core)
         return inner()
 
     @patch("os.makedirs")