]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
pytest:auth_log_base: use string_is_guid()
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 28 Feb 2024 03:19:38 +0000 (16:19 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 Feb 2024 04:01:40 +0000 (04:01 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/auth_log_base.py

index 131f019de43cd5e11d9feafab47b3da04637e597..5c5c878c8239151717ba68d7e67a5cd953472d38 100644 (file)
@@ -22,10 +22,10 @@ import samba.tests
 from samba.messaging import Messaging
 from samba.dcerpc.messaging import MSG_AUTH_LOG, AUTH_EVENT_NAME
 from samba.param import LoadParm
+from samba import string_is_guid
 import time
 import json
 import os
-import re
 
 
 def default_msg_filter(msg):
@@ -211,11 +211,6 @@ class AuthLogTestBase(samba.tests.TestCase):
 
         return list(filter(is_not_netlogon, messages))
 
-    GUID_RE = re.compile(
-        "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
-
-    #
-    # Is the supplied GUID string correctly formatted
-    #
     def is_guid(self, guid):
-        return self.GUID_RE.fullmatch(guid)
+        """Is the supplied GUID string correctly formatted"""
+        return string_is_guid(guid)