sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-20 16:23:51 +03:00
Code Activity

netcmd: tests: rename add_silo_member and remove_silo_member methods in test

Browse Source 
Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Rob van der Linde
2023-11-08 09:35:13 +13:00
committed by Andrew Bartlett
parent d9552dc08d
commit 2ee86e78cf
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
python/samba/tests/samba_tool/domain_auth_silo.py
View File

@@ -510,9 +510,9 @@ class AuthSiloMemberCmdTestCase(SiloTest):
self.addCleanup(self.samdb.delete, self.ou, ["tree_delete:1"]) self.addCleanup(self.samdb.delete, self.ou, ["tree_delete:1"])
# Assign members to silos # Assign members to silos
self.add_silo_member("Developers", "bob") self.grant_silo_access("Developers", "bob")
self.add_silo_member("Developers", "jane") self.grant_silo_access("Developers", "jane")
self.add_silo_member("Managers", "alice") self.grant_silo_access("Managers", "alice")
def create_computer(self, name): def create_computer(self, name):
"""Create a Computer and return the dn.""" """Create a Computer and return the dn."""
@@ -520,7 +520,7 @@ class AuthSiloMemberCmdTestCase(SiloTest):
self.samdb.newcomputer(name, self.ou) self.samdb.newcomputer(name, self.ou)
return dn return dn
def add_silo_member(self, silo, member): def grant_silo_access(self, silo, member):
"""Add a member to an authentication silo.""" """Add a member to an authentication silo."""
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "grant", "member", "grant",
@@ -530,9 +530,9 @@ class AuthSiloMemberCmdTestCase(SiloTest):
self.assertIn( self.assertIn(
f"User {member} granted access to the authentication silo {silo}", f"User {member} granted access to the authentication silo {silo}",
out) 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.""" """Remove a member to an authentication silo."""
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "revoke", "member", "revoke",
@@ -582,7 +582,7 @@ class AuthSiloMemberCmdTestCase(SiloTest):
def test_member_add__user(self): def test_member_add__user(self):
"""Test adding a user to an authentication silo.""" """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 # Check if member is in silo
user = self.get_user("joe") user = self.get_user("joe")