tests/auth_log: Refactor waitForMessages() to use nextMessage()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jun 14 23:55:42 UTC 2023 on atb-devel-224

diff --git a/python/samba/tests/auth_log_base.py b/python/samba/tests/auth_log_base.py
index c257f2fbafbf5c3256ac86f8f88a53605219ba36..a9b2b3fa06b203005207f34c9f144ce5beaed6e3 100644 (file)
--- a/python/samba/tests/auth_log_base.py
+++ b/python/samba/tests/auth_log_base.py
@@ -113,23 +113,16 @@ class AuthLogTestBase(samba.tests.TestCase):
         until all the logging messages have been received.
         """
 
-        def completed(messages):
-            for message in messages:
-                if self.isRemote(message) and isLastExpectedMessage(message):
-                    return True
-            return False
-
-        self.connection = connection
-
-        start_time = time.time()
-        while not completed(self.context["messages"]):
-            self.msg_ctx.loop_once(0.1)
-            if time.time() - start_time > 1:
-                self.connection = None
+        messages = []
+        while True:
+            try:
+                msg = self.nextMessage()
+            except NoMessageException:
                 return []
 
-        self.connection = None
-        return list(filter(self.isRemote, self.context["messages"]))
+            messages.append(msg)
+            if isLastExpectedMessage(msg):
+                return messages
 
     def nextMessage(self, msgFilter=None):
         """Return the next relevant message, or throw a NoMessageException."""