diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-16 08:00:31 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 10:45:07 -0500 |
| commit | 09e6b3eac584c0e3558c062610da1824bb5eb9b2 (patch) | |
| tree | caa91bf8b3a053f27c401b3ad599a410c2de2082 /testsuite | |
| parent | f522a29f8aebc26e4dedb7c6485951cfe0663ea2 (diff) | |
| download | bcfg2-09e6b3eac584c0e3558c062610da1824bb5eb9b2.tar.gz bcfg2-09e6b3eac584c0e3558c062610da1824bb5eb9b2.tar.bz2 bcfg2-09e6b3eac584c0e3558c062610da1824bb5eb9b2.zip | |
fixed unit tests
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py | 7 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index 7845d5926..fc9b5610c 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -402,17 +402,13 @@ class TestXMLFileBacked(TestFileBacked): @patch("Bcfg2.Server.FileMonitor.get_fam") def test__init(self, mock_get_fam): xfb = self.get_obj() - if self.should_monitor is True: - self.assertEqual(xfb.fam, mock_get_fam.return_value) - else: - self.assertIsNone(xfb.fam) + self.assertEqual(xfb.fam, mock_get_fam.return_value) if self.should_monitor is not True: xfb = self.get_obj() self.assertFalse(xfb.fam.AddMonitor.called) if self.should_monitor is not False: - fam.reset_mock() xfb = self.get_obj(should_monitor=True) xfb.fam.AddMonitor.assert_called_with(self.path, xfb) @@ -587,7 +583,6 @@ class TestXMLFileBacked(TestFileBacked): self.assertIn("/test/test2.xml", xfb.extras) if self.should_monitor is not True: - fam.reset_mock() xfb = self.get_obj() xfb.fam = Mock() xfb.add_monitor("/test/test3.xml") diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py index 43d594482..4db92b7c4 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py @@ -25,7 +25,7 @@ class TestHelperModule(Bcfg2TestCase): def get_obj(self, path=None): if path is None: path = self.path - return self.test_obj(path, fam=Mock()) + return self.test_obj(path) def test__init(self): hm = self.get_obj() |