mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
tests auth_log: Modify existing tests to handle NETLOGON messages
Modify the existing tests to ignore auth logging for NETLOGON messages. NETLOGON authentication is logged once per session, and is tested separately. Ignoring it in these tests avoids order dependencies. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12865 Signed-off-by: Gary Lockyer <gary@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
committed by
Andrew Bartlett
parent
ddfe8aa9cc
commit
5c27c5b6ef
@ -991,6 +991,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1020,6 +1021,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1049,6 +1051,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1077,6 +1080,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1106,6 +1110,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1135,6 +1140,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1164,6 +1170,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1194,6 +1201,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1224,6 +1232,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1252,6 +1261,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
@ -1290,6 +1300,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
|
||||
call(["bin/rpcclient", "-c", samlogon, "-U%", server])
|
||||
|
||||
messages = self.waitForMessages( isLastExpectedMessage)
|
||||
messages = self.remove_netlogon_messages(messages)
|
||||
received = len(messages)
|
||||
self.assertIs(True,
|
||||
(received == 5 or received == 6),
|
||||
|
Reference in New Issue
Block a user