diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
commit | 69ebf49d54aac70a42142d0d04e562496bce58ea (patch) | |
tree | ad0f346ff95a14ad49440128ff76d7e2b3f0816a /testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py | |
parent | 602ba6af6bd1c9b3910940dee766660ab8e81a19 (diff) | |
parent | e17e41dcff096ead7e129a0db063f75de44aaa2b (diff) | |
download | bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.gz bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.bz2 bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.zip |
Merge branch 'master' into 1.4.x
Conflicts:
doc/appendix/contributors.txt
schemas/bundle.xsd
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/Encryption.py
src/lib/Bcfg2/Server/Lint/Genshi.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/Decisions.py
src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
tools/bcfg2-profile-templates.py
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py')
-rw-r--r-- | testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py index 583d17e32..3d1ddbf84 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py @@ -14,7 +14,7 @@ while path != "/": if os.path.basename(path) == "testsuite": break path = os.path.dirname(path) -from Test__init import get_config, get_posix_object +from Test__init import get_config from Testbase import TestPOSIXTool from common import * @@ -24,34 +24,36 @@ class TestPOSIXNonexistent(TestPOSIXTool): @patch("os.path.lexists") def test_verify(self, mock_lexists): + ptool = self.get_obj() entry = lxml.etree.Element("Path", name="/test", type="nonexistent") for val in [True, False]: mock_lexists.reset_mock() mock_lexists.return_value = val - self.assertEqual(self.ptool.verify(entry, []), not val) + self.assertEqual(ptool.verify(entry, []), not val) mock_lexists.assert_called_with(entry.get("name")) def test_install(self): entry = lxml.etree.Element("Path", name="/test", type="nonexistent") - self.ptool._remove = Mock() + ptool = self.get_obj() + ptool._remove = Mock() def reset(): - self.ptool._remove.reset_mock() + ptool._remove.reset_mock() - self.assertTrue(self.ptool.install(entry)) - self.ptool._remove.assert_called_with(entry, recursive=False) + self.assertTrue(ptool.install(entry)) + ptool._remove.assert_called_with(entry, recursive=False) reset() entry.set("recursive", "true") - self.assertTrue(self.ptool.install(entry)) - self.ptool._remove.assert_called_with(entry, recursive=True) + self.assertTrue(ptool.install(entry)) + ptool._remove.assert_called_with(entry, recursive=True) reset() child_entry = lxml.etree.Element("Path", name="/test/foo", type="nonexistent") - ptool = self.get_obj(posix=get_posix_object(config=get_config([child_entry]))) + ptool = self.get_obj(config=get_config([child_entry])) ptool._remove = Mock() self.assertTrue(ptool.install(entry)) ptool._remove.assert_called_with(entry, recursive=True) @@ -59,13 +61,13 @@ class TestPOSIXNonexistent(TestPOSIXTool): reset() child_entry = lxml.etree.Element("Path", name="/test/foo", type="file") - ptool = self.get_obj(posix=get_posix_object(config=get_config([child_entry]))) + ptool = self.get_obj(config=get_config([child_entry])) ptool._remove = Mock() self.assertFalse(ptool.install(entry)) self.assertFalse(ptool._remove.called) reset() entry.set("recursive", "false") - self.ptool._remove.side_effect = OSError - self.assertFalse(self.ptool.install(entry)) - self.ptool._remove.assert_called_with(entry, recursive=False) + ptool._remove.side_effect = OSError + self.assertFalse(ptool.install(entry)) + ptool._remove.assert_called_with(entry, recursive=False) |