From: Joseph Sutton Date: Tue, 18 Jul 2023 03:55:10 +0000 (+1200) Subject: tests/krb5: Allow cached=True with an assigned silo or policy X-Git-Tag: tevent-0.16.0~1020 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=928f898e0a7cbb97993d0c4f4e3f9495c2b62bec;p=thirdparty%2Fsamba.git tests/krb5: Allow cached=True with an assigned silo or policy We might want to create an account with an assigned silo or policy in setUp() or setUpClass() to be reused in subsequent tests. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/krb5/authn_policy_tests.py b/python/samba/tests/krb5/authn_policy_tests.py index 213879e7e6e..96ee0f2a0fd 100755 --- a/python/samba/tests/krb5/authn_policy_tests.py +++ b/python/samba/tests/krb5/authn_policy_tests.py @@ -262,7 +262,11 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests): ntlm=False, spn=None, allowed_rodc=None, - cached=True): + cached=None): + if cached is None: + # Policies and silos are rarely reused between accounts. + cached = assigned_policy is None and assigned_silo is None + opts = { 'kerberos_enabled': not ntlm, 'spn': spn, @@ -278,10 +282,8 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests): members += (member_of,) if assigned_policy is not None: opts['assigned_policy'] = str(assigned_policy.dn) - cached = False # Policies are rarely reused between accounts. if assigned_silo is not None: opts['assigned_silo'] = str(assigned_silo.dn) - cached = False # Silos are rarely reused between accounts. if allowed_rodc: opts['allowed_replication_mock'] = True opts['revealed_to_mock_rodc'] = True