From c8f85ee751ad97fdea9d4a695a4fbaa95883fd52 Mon Sep 17 00:00:00 2001 From: twangboy Date: Mon, 20 Apr 2020 11:15:34 -0600 Subject: [PATCH 1/2] Backport #53994 Fix typo perkissive to permissive --- tests/unit/daemons/test_masterapi.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/unit/daemons/test_masterapi.py b/tests/unit/daemons/test_masterapi.py index c787840f0f07..0be49a1f6bd3 100644 --- a/tests/unit/daemons/test_masterapi.py +++ b/tests/unit/daemons/test_masterapi.py @@ -105,7 +105,8 @@ def test_check_permissions_others_can_write(self): @patch_check_permissions() def test_check_permissions_group_can_write_not_permissive(self): """ - Assert that a file is accepted, when group can write to it and perkissive_pki_access=False + Assert that a file is accepted, when group can write to it and + permissive_pki_access=False """ self.stats["testfile"] = {"mode": gen_permissions("w", "w", ""), "gid": 1} if salt.utils.platform.is_windows(): @@ -116,7 +117,8 @@ def test_check_permissions_group_can_write_not_permissive(self): @patch_check_permissions(permissive_pki=True) def test_check_permissions_group_can_write_permissive(self): """ - Assert that a file is accepted, when group can write to it and perkissive_pki_access=True + Assert that a file is accepted, when group can write to it and + permissive_pki_access=True """ self.stats["testfile"] = {"mode": gen_permissions("w", "w", ""), "gid": 1} self.assertTrue(self.auto_key.check_permissions("testfile")) @@ -124,8 +126,8 @@ def test_check_permissions_group_can_write_permissive(self): @patch_check_permissions(uid=0, permissive_pki=True) def test_check_permissions_group_can_write_permissive_root_in_group(self): """ - Assert that a file is accepted, when group can write to it, perkissive_pki_access=False, - salt is root and in the file owning group + Assert that a file is accepted, when group can write to it, + permissive_pki_access=False, salt is root and in the file owning group """ self.stats["testfile"] = {"mode": gen_permissions("w", "w", ""), "gid": 0} self.assertTrue(self.auto_key.check_permissions("testfile")) @@ -133,8 +135,9 @@ def test_check_permissions_group_can_write_permissive_root_in_group(self): @patch_check_permissions(uid=0, permissive_pki=True) def test_check_permissions_group_can_write_permissive_root_not_in_group(self): """ - Assert that no file is accepted, when group can write to it, perkissive_pki_access=False, - salt is root and **not** in the file owning group + Assert that no file is accepted, when group can write to it, + permissive_pki_access=False, salt is root and **not** in the file owning + group """ self.stats["testfile"] = {"mode": gen_permissions("w", "w", ""), "gid": 1} if salt.utils.platform.is_windows(): From 591e8108a848ed7e4cb3b418fa4d33a4f3d0a8b0 Mon Sep 17 00:00:00 2001 From: twangboy Date: Mon, 20 Apr 2020 11:18:46 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42b7ab0eb44d..69b0acdfb881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Versions are `MAJOR.PATCH`. ### Deprecated ### Changed +- [#56731](https://github.com/saltstack/salt/pull/56731) - Backport #53994 ### Fixed - [#56237](https://github.com/saltstack/salt/pull/56237) - Fix alphabetical ordering and remove duplicates across all documentation indexes - [@myii](https://github.com/myii)