import os
import re
+
def getAudit(message):
if "type" not in message:
return None
audit = message[type]
return audit
-class AuditLogTestBase(samba.tests.TestCase):
+class AuditLogTestBase(samba.tests.TestCase):
def setUp(self):
super(AuditLogTestBase, self).setUp()
def isRemote(message):
audit = getAudit(message)
if audit is None:
- return false
+ return False
remote = audit["remoteAddress"]
if remote is None:
elif jsonMsg["type"] == "dsdbTransaction":
context["txnMessage"] = jsonMsg
- self.context = {"messages": [], "txnMessage": ""}
+ self.context = {"messages": [], "txnMessage": None}
self.msg_handler_and_context = (messageHandler, self.context)
self.msg_ctx.register(self.msg_handler_and_context,
msg_type=self.message_type)
return True
return False
-
def waitForMessages(self, number, connection=None, dn=None):
"""Wait for all the expected messages to arrive
The connection is passed through to keep the connection alive
# Discard any previously queued messages.
def discardMessages(self):
self.msg_ctx.loop_once(0.001)
- while len(self.context["messages"]):
+ while (len(self.context["messages"]) or
+ self.context["txnMessage"] is not None):
+
self.context["messages"] = []
+ self.context["txnMessage"] = None
self.msg_ctx.loop_once(0.001)
GUID_RE = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"