diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 09:55:53 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 09:55:53 -0400 |
commit | 6de50a235ed21de987488a2890b13f029d1962b4 (patch) | |
tree | ee540c156370cb4dd00b1d54f4bdeb6e42fd47cc /testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py | |
parent | ad0798f9e7fe105fa1314daf0213d8d3d50bd2e1 (diff) | |
download | bcfg2-6de50a235ed21de987488a2890b13f029d1962b4.tar.gz bcfg2-6de50a235ed21de987488a2890b13f029d1962b4.tar.bz2 bcfg2-6de50a235ed21de987488a2890b13f029d1962b4.zip |
made POSIX subtool tests inherit from base POSIX tool tests
Diffstat (limited to 'testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py')
-rw-r--r-- | testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py index 9ac23921c..8d959a15f 100644 --- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py +++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py @@ -5,18 +5,16 @@ import lxml.etree from mock import Mock, MagicMock, patch from Bcfg2.Client.Tools.POSIX.Nonexistent import * from Test__init import get_config, get_posix_object +from Testbase import TestPOSIXTool from .....common import * -def get_nonexistent_object(posix=None): - if posix is None: - posix = get_posix_object() - return POSIXNonexistent(posix.logger, posix.setup, posix.config) +class TestPOSIXNonexistent(TestPOSIXTool): + test_obj = POSIXNonexistent -class TestPOSIXNonexistent(Bcfg2TestCase): @patch("os.path.lexists") def test_verify(self, mock_lexists): entry = lxml.etree.Element("Path", name="/test", type="nonexistent") - ptool = get_nonexistent_object() + ptool = self.get_obj() for val in [True, False]: mock_lexists.reset_mock() @@ -29,7 +27,7 @@ class TestPOSIXNonexistent(Bcfg2TestCase): @patch("shutil.rmtree") def test_install(self, mock_rmtree, mock_remove, mock_rmdir): entry = lxml.etree.Element("Path", name="/test", type="nonexistent") - ptool = get_nonexistent_object() + ptool = self.get_obj() with patch("os.path.isdir") as mock_isdir: def reset(): @@ -70,7 +68,7 @@ class TestPOSIXNonexistent(Bcfg2TestCase): reset() child_entry = lxml.etree.Element("Path", name="/test/foo", type="nonexistent") - ptool = get_nonexistent_object(posix=get_posix_object(config=get_config([child_entry]))) + ptool = self.get_obj(posix=get_posix_object(config=get_config([child_entry]))) mock_rmtree.side_effect = None self.assertTrue(ptool.install(entry)) mock_rmtree.assert_called_with(entry.get("name")) @@ -78,6 +76,6 @@ class TestPOSIXNonexistent(Bcfg2TestCase): reset() child_entry = lxml.etree.Element("Path", name="/test/foo", type="file") - ptool = get_nonexistent_object(posix=get_posix_object(config=get_config([child_entry]))) + ptool = self.get_obj(posix=get_posix_object(config=get_config([child_entry]))) mock_rmtree.side_effect = None self.assertFalse(ptool.install(entry)) |