From cf99f2c92391fb1652bbef93089d60b11f1b8229 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 13 Jun 2017 11:20:58 +1200 Subject: [PATCH] selftest: Pass the dcerpc binding object to self.waitForMessages in auth_log This ensures that object is not cleaned up, triggering a disconnect before we get back the audit messages. Otherwise they can be lost when the server task calls exit() while the message thread is still trying to send them. Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- python/samba/tests/auth_log.py | 14 +++++++------- python/samba/tests/auth_log_samlogon.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py index 6f32712c339..ff84befda45 100644 --- a/python/samba/tests/auth_log.py +++ b/python/samba/tests/auth_log.py @@ -250,16 +250,16 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): binding = "[%s]" % binding if service == "dnsserver": - dnsserver.dnsserver("ncacn_ip_tcp:%s%s" % (self.server, binding), - self.get_loadparm(), - creds) + conn = dnsserver.dnsserver("ncacn_ip_tcp:%s%s" % (self.server, binding), + self.get_loadparm(), + creds) elif service == "srvsvc": - srvsvc.srvsvc("ncacn_ip_tcp:%s%s" % (self.server, binding), - self.get_loadparm(), - creds) + conn = srvsvc.srvsvc("ncacn_ip_tcp:%s%s" % (self.server, binding), + self.get_loadparm(), + creds) - messages = self.waitForMessages(isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage, conn) checkFunction(messages, authTypes, service, binding, protection) def rpc_ncacn_ip_tcp_ntlm_check(self, messages, authTypes, service, diff --git a/python/samba/tests/auth_log_samlogon.py b/python/samba/tests/auth_log_samlogon.py index cbef5a19308..d24986b68a5 100644 --- a/python/samba/tests/auth_log_samlogon.py +++ b/python/samba/tests/auth_log_samlogon.py @@ -152,7 +152,7 @@ class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase): (validation, authoritative, netr_flags_out) = result - messages = self.waitForMessages(isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage, netlogon_conn) checkFunction(messages) def samlogon_check(self, messages): -- 2.25.1