diff options
author | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
---|---|---|
committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
commit | 894299b01b6138c54a99fd41f166554d175d6106 (patch) | |
tree | 88e11cb8c49d3f933cf5f622a93dfa123922960f /testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py | |
parent | de0ae51b6dc635a3acd2491d4ca3fd021aa55873 (diff) | |
parent | f4da37aa0a360add3f5c40f37cd3cc010ef8788f (diff) | |
download | bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.gz bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.bz2 bcfg2-894299b01b6138c54a99fd41f166554d175d6106.zip |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py')
-rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py | 21 |
1 files changed, 13 insertions, 8 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() |