pytest:sid_strings: same timestamp for all tests in the run

We don't care about the exact time of the test, just that we
disambiguate between different runs (each run leaves an immutable scar
on the target server).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/sid_strings.py b/python/samba/tests/sid_strings.py
index 71b7756d235fb4e207d955df1c702936d146f933..f44a0508e86d4c433aaea6a1e191e1c86ec620db 100644 (file)
--- a/python/samba/tests/sid_strings.py
+++ b/python/samba/tests/sid_strings.py
@@ -78,12 +78,12 @@ class SidStringTests(TestCase):
                         session_info=system_session(lp), lp=lp)
         cls.base_dn = cls.ldb.domain_dn()
         cls.schema_dn = cls.ldb.get_schema_basedn().get_linearized()
+        cls.timestamp = str(int(time.time()))
 
     def _test_sid_string_with_args(self, code, expected_sid):
         random_suffix = random.randint(0, 100000)
-        timestamp = time.strftime('%s', time.gmtime())
 
-        class_name = f'my-Sid-String-Class{timestamp}{random_suffix}'
+        class_name = f'my-Sid-String-Class-{self.timestamp}-{random_suffix}'
         class_ldap_display_name = class_name.replace('-', '')
 
         class_dn = f'CN={class_name},{self.schema_dn}'
@@ -126,7 +126,7 @@ schemaUpdateNow: 1
 '''
         self.ldb.modify_ldif(ldif)
 
-        object_name = f'sddl_{timestamp}_{random_suffix}'
+        object_name = f'sddl_{self.timestamp}_{random_suffix}'
         object_dn = f'CN={object_name},{self.base_dn}'
 
         ldif = f'''

diff --git a/selftest/knownfail.d/sid-strings b/selftest/knownfail.d/sid-strings
index 69536432585bead4890814dfe6aa628cba358ca5..745b25a55852f112b9ee5f303db8c1e4b47ffadf 100644 (file)
--- a/selftest/knownfail.d/sid-strings
+++ b/selftest/knownfail.d/sid-strings
@@ -1,3 +1,3 @@
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_Aa.ad_dc
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_aA.ad_dc
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_aa.ad_dc
+^samba.tests.sid_strings.+.SidStringTests.test_sid_string_Aa.ad_dc
+^samba.tests.sid_strings.+.SidStringTests.test_sid_string_aA.ad_dc
+^samba.tests.sid_strings.+.SidStringTests.test_sid_string_aa.ad_dc