From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 19 Oct 2021 23:41:39 +0000 (+1300)
Subject: tests/krb5: Allow specifying prefix or suffix for test account names
X-Git-Tag: ldb-2.5.0~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e39994ed341883ac4c8c257220c19dbf70c7bc5;p=thirdparty%2Fsamba.git

tests/krb5: Allow specifying prefix or suffix for test account names

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14874

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

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 8f453b464fd..d8f3969d228 100644
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -630,6 +630,8 @@ class KDCBaseTest(RawKerberosTest):
             opts = {}
 
         opts_default = {
+            'name_prefix': None,
+            'name_suffix': None,
             'spn': None,
             'allowed_replication': False,
             'allowed_replication_mock': False,
@@ -667,6 +669,8 @@ class KDCBaseTest(RawKerberosTest):
 
     def create_account_opts(self, *,
                             account_type,
+                            name_prefix,
+                            name_suffix,
                             spn,
                             allowed_replication,
                             allowed_replication_mock,
@@ -696,6 +700,10 @@ class KDCBaseTest(RawKerberosTest):
 
         user_name = self.account_base + str(self.account_id)
         type(self).account_id += 1
+        if name_prefix is not None:
+            user_name = name_prefix + user_name
+        if name_suffix is not None:
+            user_name += name_suffix
 
         user_account_control = 0
         if trusted_to_auth_for_delegation: