diff options
4 files changed, 9 insertions, 9 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() diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index b16f1a1a2..e48507a57 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -1699,7 +1699,7 @@ class TestEntrySet(TestDebuggable): idata = ["owner:owner", "group: GROUP", - "perms: 775", + "mode: 775", "important: true", "bogus: line"] mock_open.return_value.readlines.return_value = idata @@ -1707,7 +1707,7 @@ class TestEntrySet(TestDebuggable): expected = DEFAULT_FILE_METADATA.copy() expected['owner'] = 'owner' expected['group'] = 'GROUP' - expected['perms'] = '0775' + expected['mode'] = '0775' expected['important'] = 'true' self.assertItemsEqual(eset.metadata, expected) diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py index 8cfd69242..2f24f4533 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/Test_init.py @@ -582,7 +582,7 @@ class TestCfgEntrySet(TestEntrySet): generator.get_data.return_value = "data" eset.best_matching.return_value = generator eset.get_handlers = Mock() - entry = lxml.etree.Element("Path", name="/test.txt", perms="0640") + entry = lxml.etree.Element("Path", name="/test.txt", mode="0640") metadata = Mock() def reset(): |