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

netcmd: tests: stop checking for ERROR prefix from CommandError

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-10-19 14:26:46 +13:00
committed by Andrew Bartlett
parent fb058e7f2c
commit 6943a58bff
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/samba/tests/samba_tool/domain_auth_policy.py
View File

@@ -312,7 +312,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
result, out, err = self.runcmd("domain", "auth", "policy", "create",
"--name", "createFails")
self.assertEqual(result, -1)
self.assertIn("ERROR: Custom error message", err)
self.assertIn("Custom error message", err)
def test_authentication_policy_modify_description(self):
"""Test modifying an authentication policy description."""
@@ -480,8 +480,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
"--name", "doesNotExist",
"--description", "NewDescription")
self.assertEqual(result, -1)
self.assertIn("ERROR: Authentication policy doesNotExist not found.",
err)
self.assertIn("Authentication policy doesNotExist not found.", err)
def test_authentication_policy_modify_audit_enforce(self):
"""Test modify authentication policy using --audit and --enforce."""
@@ -564,7 +563,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
"--name", "Single Policy",
"--description", "New description")
self.assertEqual(result, -1)
self.assertIn("ERROR: Custom error message", err)
self.assertIn("Custom error message", err)
def test_authentication_policy_delete(self):
"""Test deleting an authentication policy that is not protected."""
@@ -643,7 +642,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
"--name", "deleteForceFail",
"--force")
self.assertEqual(result, -1)
self.assertIn("ERROR: Custom error message", err)
self.assertIn("Custom error message", err)
def test_authentication_policy_delete_fails(self):
"""Test deleting an authentication policy, but it fails."""
@@ -660,7 +659,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
result, out, err = self.runcmd("domain", "auth", "policy", "delete",
"--name", "regularPolicy")
self.assertEqual(result, -1)
self.assertIn("ERROR: Custom error message", err)
self.assertIn("Custom error message", err)
# When not using --force we get a hint.
self.assertIn("Try --force", err)
@@ -682,7 +681,7 @@ class AuthPolicyCmdTestCase(BaseAuthCmdTest):
"--name", "protectedPolicy",
"--force")
self.assertEqual(result, -1)
self.assertIn("ERROR: Custom error message", err)
self.assertIn("Custom error message", err)
# When using --force we don't get the hint.
self.assertNotIn("Try --force", err)