summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestClient
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-10-15 14:27:32 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-10-15 14:27:32 -0500
commit7aae23bea73af6a7ba19f1353b2089738b2841e9 (patch)
tree4911568449db927602fb00b0a3c39c3c4c7248dc /testsuite/Testsrc/Testlib/TestClient
parent92509f22ef81e86bc5443d879ac974f1e0784f72 (diff)
downloadbcfg2-7aae23bea73af6a7ba19f1353b2089738b2841e9.tar.gz
bcfg2-7aae23bea73af6a7ba19f1353b2089738b2841e9.tar.bz2
bcfg2-7aae23bea73af6a7ba19f1353b2089738b2841e9.zip
testsuite: Fix more 'mode' tests
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestClient')
-rw-r--r--testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py4
-rw-r--r--testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
index 1ce6562c5..6dd130bee 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
@@ -27,7 +27,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
@patch("Bcfg2.Client.Tools.POSIX.Directory.%s._exists" % test_obj.__name__)
def test_verify(self, mock_exists, mock_verify, mock_listdir):
entry = lxml.etree.Element("Path", name="/test", type="directory",
- perms='0644', owner='root', group='root')
+ mode='0644', owner='root', group='root')
mock_exists.return_value = False
self.assertFalse(self.ptool.verify(entry, []))
@@ -94,7 +94,7 @@ class TestPOSIXDirectory(TestPOSIXTool):
def test_install(self, mock_makedirs, mock_exists, mock_install,
mock_rmtree, mock_isdir, mock_unlink):
entry = lxml.etree.Element("Path", name="/test/foo/bar",
- type="directory", perms='0644',
+ type="directory", mode='0644',
owner='root', group='root')
def reset():
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
index f69c33a97..69b021421 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
@@ -158,7 +158,7 @@ class TestPOSIXFile(TestPOSIXTool):
@patch("Bcfg2.Client.Tools.POSIX.File.%s._get_data" % test_obj.__name__)
def test_write_tmpfile(self, mock_get_data, mock_mkstemp, mock_fdopen):
entry = lxml.etree.Element("Path", name="/test", type="file",
- perms='0644', owner='root', group='root')
+ mode='0644', owner='root', group='root')
newfile = "/foo/bar"
def reset():
@@ -191,7 +191,7 @@ class TestPOSIXFile(TestPOSIXTool):
@patch("os.unlink")
def test_rename_tmpfile(self, mock_unlink, mock_rename):
entry = lxml.etree.Element("Path", name="/test", type="file",
- perms='0644', owner='root', group='root')
+ mode='0644', owner='root', group='root')
newfile = "/foo/bar"
self.assertTrue(self.ptool._rename_tmpfile(newfile, entry))
@@ -219,7 +219,7 @@ class TestPOSIXFile(TestPOSIXTool):
def test__get_diffs(self, mock_is_string, mock_get_data, mock_diff,
mock_open):
orig_entry = lxml.etree.Element("Path", name="/test", type="file",
- perms='0644', owner='root',
+ mode='0644', owner='root',
group='root')
orig_entry.text = "test"
ondisk = "test2"
@@ -337,7 +337,7 @@ class TestPOSIXFile(TestPOSIXTool):
def test_install(self, mock_rename, mock_write, mock_set_perms,
mock_makedirs, mock_install, mock_exists):
entry = lxml.etree.Element("Path", name="/test", type="file",
- perms='0644', owner='root', group='root')
+ mode='0644', owner='root', group='root')
def reset():
mock_rename.reset_mock()