From b0c95099f33f076a2bbc47a03b2a3aacab05d995 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Thu, 10 Oct 2024 18:42:25 +0000
Subject: [PATCH] Tests: Add _LiveViewer.is_connected()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I3adf51ceea08d62e3d23598b57460427cf5561ea
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 tests/utils/lttngtest/environment.py | 32 ++++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tests/utils/lttngtest/environment.py b/tests/utils/lttngtest/environment.py
index fe37cfa7c..65d74a41d 100644
--- a/tests/utils/lttngtest/environment.py
+++ b/tests/utils/lttngtest/environment.py
@@ -151,7 +151,7 @@ class _LiveViewer:
                 else:
                     break
 
-    def wait_until_connected(self, timeout=0):
+    def is_connected(self):
         ctf_live_cc = bt2.find_plugin("ctf").source_component_classes["lttng-live"]
         self._environment._log(
             "Checking for connected clients at 'net://localhost:{}'".format(
@@ -167,6 +167,21 @@ class _LiveViewer:
                 )
             },
         )
+
+        for live_session in query_executor.query():
+            if (
+                live_session["session-name"] == self._session
+                and live_session["client-count"] >= 1
+            ):
+                self._environment._log(
+                    "Session '{}' has {} connected clients".format(
+                        live_session["session-name"], live_session["client-count"]
+                    )
+                )
+                return True
+        return False
+
+    def wait_until_connected(self, timeout=0):
         connected = False
         started = time.time()
         while not connected:
@@ -177,22 +192,11 @@ class _LiveViewer:
                             self._session, time.time() - started
                         )
                     )
-                query_result = query_executor.query()
+
+                connected = self.is_connected()
             except bt2._Error:
                 time.sleep(0.01)
                 continue
-            for live_session in query_result:
-                if (
-                    live_session["session-name"] == self._session
-                    and live_session["client-count"] >= 1
-                ):
-                    connected = True
-                    self._environment._log(
-                        "Session '{}' has {} connected clients".format(
-                            live_session["session-name"], live_session["client-count"]
-                        )
-                    )
-                    break
         return connected
 
     def wait(self):
-- 
2.34.1