fixed tests for set_debug

2 files changed, 19 insertions, 14 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
index f2cd39142..2eda38cdc 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
@@ -27,22 +27,27 @@ class TestDebuggable(Bcfg2TestCase):
         self.assertIsInstance(d.logger, logging.Logger)
         self.assertFalse(d.debug_flag)
 
-    def test_toggle_debug(self):
+    def test_set_debug(self):
         d = self.get_obj()
         d.debug_log = Mock()
-        orig = d.debug_flag
-        d.toggle_debug()
-        self.assertNotEqual(orig, d.debug_flag)
+        self.assertEqual(True, d.set_debug(True))
+        self.assertEqual(d.debug_flag, True)
         self.assertTrue(d.debug_log.called)
 
         d.debug_log.reset_mock()
 
-        changed = d.debug_flag
-        d.toggle_debug()
-        self.assertNotEqual(changed, d.debug_flag)
-        self.assertEqual(orig, d.debug_flag)
+        self.assertEqual(False, d.set_debug(False))
+        self.assertEqual(d.debug_flag, False)
         self.assertTrue(d.debug_log.called)
 
+    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()
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
index 8abbd9088..d3e97df8d 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
@@ -1902,22 +1902,22 @@ class TestGroupSpool(TestPlugin, TestGenerator):
                              gs.handles[event.requestID].rstrip('/'))
             mock_isdir.assert_called_with(gs.event_path.return_value)
 
-    def test_toggle_debug(self):
+    def test_set_debug(self):
         gs = self.get_obj()
         gs.entries = {"/foo": Mock(),
                       "/bar": Mock(),
                       "/baz/quux": Mock()}
 
-        @patch("Bcfg2.Server.Plugin.helpers.Plugin.toggle_debug")
+        @patch("Bcfg2.Server.Plugin.helpers.Plugin.set_debug")
         def inner(mock_debug):
-            gs.toggle_debug()
-            mock_debug.assert_called_with(gs)
+            gs.set_debug(True)
+            mock_debug.assert_called_with(gs, True)
             for entry in gs.entries.values():
-                entry.toggle_debug.assert_any_call()
+                entry.set_debug.assert_called_with(True)
 
         inner()
 
-        TestPlugin.test_toggle_debug(self)
+        TestPlugin.test_set_debug(self)
 
     def test_HandleEvent(self):
         gs = self.get_obj()