From 72eb00d3a27466e1df9d0fc426025a9147549377 Mon Sep 17 00:00:00 2001
From: sylwiaszunejko <sylwia.szunejko@gmail.com>
Date: Wed, 28 Jan 2026 12:39:48 +0100
Subject: [PATCH] Fix test_client_routes_change_event

---
 .../standard/test_control_connection.py       | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/tests/integration/standard/test_control_connection.py b/tests/integration/standard/test_control_connection.py
index cb7820f0a6..8dc465eb48 100644
--- a/tests/integration/standard/test_control_connection.py
+++ b/tests/integration/standard/test_control_connection.py
@@ -137,12 +137,12 @@ def test_control_connection_port_discovery(self):
             assert 7000 == host.broadcast_port
 
     @xfail_scylla_version_lt(reason='scylladb/scylladb#26992 - system.client_routes is not yet supported',
-                             oss_scylla_version="7.0", ent_scylla_version="2025.4.0")
+                             oss_scylla_version="7.0", ent_scylla_version="2026.1.0")
     def test_client_routes_change_event(self):
         cluster = TestCluster()
 
         # Establish control connection
-        cluster.connect()
+        self.session = self.cluster.connect()
 
         flag = Event()
 
@@ -161,7 +161,7 @@ def on_event(event):
             finally:
                 flag.set()
 
-        cluster.control_connection._connection.register_watchers({"CLIENT_ROUTES_CHANGE": on_event})
+        self.session.cluster.control_connection._connection.register_watchers({"CLIENT_ROUTES_CHANGE": on_event})
 
         try:
             payload = [
@@ -170,22 +170,12 @@ def on_event(event):
                     "host_id": host_ids[0],
                     "address": "localhost",
                     "port": 9042,
-                    "tls_port": 0,
-                    "alternator_port": 0,
-                    "alternator_https_port": 0,
-                    "rack": "string",
-                    "datacenter": "string"
                 },
                 {
                     "connection_id": connection_ids[1],
                     "host_id": host_ids[1],
                     "address": "localhost",
                     "port": 9042,
-                    "tls_port": 0,
-                    "alternator_port": 0,
-                    "alternator_https_port": 0,
-                    "rack": "string",
-                    "datacenter": "string"
                 }
             ]
             response = requests.post(
@@ -197,7 +187,7 @@ def on_event(event):
                 })
             assert response.status_code == 200
             assert flag.wait(20), "Schema change event was not received after registering watchers"
-            assert got_connection_ids == connection_ids
-            assert got_host_ids == host_ids
+            assert set(got_connection_ids) == set(connection_ids)
+            assert set(got_host_ids) == set(host_ids)
         finally:
             cluster.shutdown()