tests/krb5: Don’t unnecessarily specify ‘id’

In tests where we have multiple accounts of the same type, we use the
‘id’ parameter to ensure that these accounts are all different, as some
restrictions are bypassed if an account authenticates to the selfsame
account. However, this is unnecessary if we already specify (with
‘use_cache=False’) that the cache is not to be used.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/python/samba/tests/krb5/authn_policy_tests.py b/python/samba/tests/krb5/authn_policy_tests.py
index 29bde221a8961def1015b1da4fd9f8b5b0c1929d..7839c5b91aaa57c871cd32b11d9f5e5f7d68d1be 100755 (executable)
--- a/python/samba/tests/krb5/authn_policy_tests.py
+++ b/python/samba/tests/krb5/authn_policy_tests.py
@@ -4444,7 +4444,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a computer account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         client_dn = client_creds.get_dn()
         tgt = self.get_tgt(client_creds)
@@ -4479,7 +4478,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a computer account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         client_dn = client_creds.get_dn()
         tgt = self.get_tgt(client_creds)
@@ -4680,7 +4678,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a target account.
         target_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         target_spn = target_creds.get_spn()
 
@@ -4803,7 +4800,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a target account.
         target_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         target_spn = target_creds.get_spn()
 
@@ -4889,7 +4885,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a target account.
         target_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         target_spn = target_creds.get_spn()
 
@@ -5267,7 +5262,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a service account.
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_spn = service_creds.get_spn()
@@ -5356,7 +5350,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a service account.
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_spn = service_creds.get_spn()
@@ -5441,7 +5434,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a service account.
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_sid = service_creds.get_sid()
@@ -5710,7 +5702,6 @@ class AuthnPolicyTests(AuthLogTestBase, KdcTgsBaseTests):
         # Create a service account.
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
-            opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_sid = service_creds.get_sid()