diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 210c2d4e2b..f1d86a72b0 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -38,7 +38,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-tests')" runs-on: ubuntu-24.04 env: - SCYLLA_VERSION: release:2025.2 + SCYLLA_VERSION: release:2026.1 strategy: fail-fast: false matrix: diff --git a/tests/integration/standard/test_control_connection.py b/tests/integration/standard/test_control_connection.py index cb7820f0a6..bb7fe73ab4 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,9 +170,6 @@ 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" }, @@ -181,9 +178,6 @@ def on_event(event): "host_id": host_ids[1], "address": "localhost", "port": 9042, - "tls_port": 0, - "alternator_port": 0, - "alternator_https_port": 0, "rack": "string", "datacenter": "string" } @@ -197,7 +191,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()