mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
pytest:audit_log_base: use string_is_guid()
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
6d087d1d29
commit
8cf9d4cae1
@ -21,10 +21,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 getAudit(message):
|
||||
@ -190,14 +190,9 @@ class AuditLogTestBase(samba.tests.TestCase):
|
||||
# No new messages. We’ve probably got them all.
|
||||
break
|
||||
|
||||
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)
|
||||
|
||||
def get_session(self):
|
||||
return self.auth_context["sessionId"]
|
||||
|
Loading…
Reference in New Issue
Block a user