From 2ee86e78cf6119b0280e6777f1c97aa60ae9c4d2 Mon Sep 17 00:00:00 2001 From: Rob van der Linde Date: Wed, 8 Nov 2023 09:35:13 +1300 Subject: [PATCH] netcmd: tests: rename add_silo_member and remove_silo_member methods in test Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/tests/samba_tool/domain_auth_silo.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python/samba/tests/samba_tool/domain_auth_silo.py b/python/samba/tests/samba_tool/domain_auth_silo.py index ae6476e363c..82919517b9f 100644 --- a/python/samba/tests/samba_tool/domain_auth_silo.py +++ b/python/samba/tests/samba_tool/domain_auth_silo.py @@ -510,9 +510,9 @@ class AuthSiloMemberCmdTestCase(SiloTest): self.addCleanup(self.samdb.delete, self.ou, ["tree_delete:1"]) # Assign members to silos - self.add_silo_member("Developers", "bob") - self.add_silo_member("Developers", "jane") - self.add_silo_member("Managers", "alice") + self.grant_silo_access("Developers", "bob") + self.grant_silo_access("Developers", "jane") + self.grant_silo_access("Managers", "alice") def create_computer(self, name): """Create a Computer and return the dn.""" @@ -520,7 +520,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): self.samdb.newcomputer(name, self.ou) return dn - def add_silo_member(self, silo, member): + def grant_silo_access(self, silo, member): """Add a member to an authentication silo.""" result, out, err = self.runcmd("domain", "auth", "silo", "member", "grant", @@ -530,9 +530,9 @@ class AuthSiloMemberCmdTestCase(SiloTest): self.assertIn( f"User {member} granted access to the authentication silo {silo}", out) - self.addCleanup(self.remove_silo_member, silo, member) + self.addCleanup(self.revoke_silo_access, silo, member) - def remove_silo_member(self, silo, member): + def revoke_silo_access(self, silo, member): """Remove a member to an authentication silo.""" result, out, err = self.runcmd("domain", "auth", "silo", "member", "revoke", @@ -582,7 +582,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): def test_member_add__user(self): """Test adding a user to an authentication silo.""" - self.add_silo_member("Developers", "joe") + self.grant_silo_access("Developers", "joe") # Check if member is in silo user = self.get_user("joe") -- 2.47.3