From: Andrew Bartlett Date: Wed, 5 Apr 2023 20:54:02 +0000 (+1200) Subject: dsdb/tests: Move SD modification on class-created objects to classSetUp X-Git-Tag: talloc-2.4.1~1053 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1c0c2066c2f29bb614e3386b796eec3cb289aea;p=thirdparty%2Fsamba.git dsdb/tests: Move SD modification on class-created objects to classSetUp These modifications persist, so should be done at the class level, not in the test. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15351 Signed-off-by: Andrew Bartlett Reviewed-by: Joseph Sutton --- diff --git a/source4/dsdb/tests/python/large_ldap.py b/source4/dsdb/tests/python/large_ldap.py index 9f9e23fb76e..302e0002095 100644 --- a/source4/dsdb/tests/python/large_ldap.py +++ b/source4/dsdb/tests/python/large_ldap.py @@ -145,6 +145,14 @@ class LargeLDAPTest(samba.tests.TestCase): "sAMAccountName": user_name, "jpegPhoto": b'a' * (2 * 1024 * 1024)}) + ace = "(OD;;RP;{6bc69afa-7bd9-4184-88f5-28762137eb6a};;S-1-%d)" % x + dn = ldb.Dn(cls.ldb, "cn=" + user_name + "," + str(cls.ou_dn)) + + # add an ACE that denies access to the above random attr + # for a not-existing user. This makes each SD distinct + # and so will slow SD parsing. + cls.sd_utils.dacl_add_ace(dn, ace) + @classmethod def tearDownClass(cls): # Remake the connection for tear-down (old Samba drops the socket) @@ -289,16 +297,6 @@ class LargeLDAPTest(samba.tests.TestCase): session_info=system_session(lp), lp=lp) - for x in range(200): - user_name = self.USER_NAME + format(x, "03") - ace = "(OD;;RP;{6bc69afa-7bd9-4184-88f5-28762137eb6a};;S-1-%d)" % x - dn = ldb.Dn(self.ldb, "cn=" + user_name + "," + str(self.ou_dn)) - - # add an ACE that denies access to the above random attr - # for a not-existing user. This makes each SD distinct - # and so will slow SD parsing. - self.sd_utils.dacl_add_ace(dn, ace) - # Create a large search expression that will take a long time to # evaluate. expression = f'(jpegPhoto=*X*)' * 1000