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

python: tests: addCleanup is always before create operation

Browse Source 
This way if it raises during a create, it will still end up running the cleanup.

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-10-25 16:02:31 +13:00
committed by Andrew Bartlett
parent d19e268221
commit e87d74066a
2 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,11 +227,12 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_modify__description(self):
"""Test modify authentication silo changing the description field."""
# Create a silo to modify for this test.
name = "modifyDescription"
self.runcmd("domain", "auth", "silo", "create", "--name", name)
# Create a silo to modify for this test.
self.addCleanup(self.delete_authentication_silo,
name=name, force=True)
self.runcmd("domain", "auth", "silo", "create", "--name", name)
result, out, err = self.runcmd("domain", "auth", "silo", "modify",
"--name", name,
@@ -244,11 +245,12 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_modify__audit_enforce(self):
"""Test modify authentication silo setting --audit and --enforce."""
# Create a silo to modify for this test.
name = "modifyEnforce"
self.runcmd("domain", "auth", "silo", "create", "--name", name)
# Create a silo to modify for this test.
self.addCleanup(self.delete_authentication_silo,
name=name, force=True)
self.runcmd("domain", "auth", "silo", "create", "--name", name)
result, out, err = self.runcmd("domain", "auth", "silo", "modify",
"--name", name,
@@ -270,11 +272,12 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_modify__protect_unprotect(self):
"""Test modify un-protecting and protecting an authentication silo."""
# Create a silo to modify for this test.
name = "modifyProtect"
self.runcmd("domain", "auth", "silo", "create", "--name", name)
# Create a silo to modify for this test.
self.addCleanup(self.delete_authentication_silo,
name=name, force=True)
self.runcmd("domain", "auth", "silo", "create", "--name", name)
utils = SDUtils(self.samdb)
result, out, err = self.runcmd("domain", "auth", "silo", "modify",
@@ -402,6 +405,8 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_delete__force_fails(self):
"""Test deleting an authentication silo with --force, but it fails."""
# Create protected authentication silo.
self.addCleanup(self.delete_authentication_silo,
name="deleteForceFail", force=True)
result, out, err = self.runcmd("domain", "auth", "silo", "create",
"--name=deleteForceFail",
"--user-authentication-policy", "User Policy",
@@ -423,6 +428,8 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_delete__fails(self):
"""Test deleting an authentication silo, but it fails."""
# Create regular authentication silo.
self.addCleanup(self.delete_authentication_silo,
name="regularSilo", force=True)
result, out, err = self.runcmd("domain", "auth", "silo", "create",
"--name=regularSilo",
"--user-authentication-policy", "User Policy")
@@ -444,6 +451,8 @@ class AuthSiloCmdTestCase(BaseAuthCmdTest):
def test_delete__protected_fails(self):
"""Test deleting an authentication silo, but it fails."""
# Create protected authentication silo.
self.addCleanup(self.delete_authentication_silo,
name="protectedSilo", force=True)
result, out, err = self.runcmd("domain", "auth", "silo", "create",
"--name=protectedSilo",
"--user-authentication-policy", "User Policy",