Skip to content

Fix test_client_routes_change_event #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylwiaszunejko wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −12
Open

Fix test_client_routes_change_event #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8adfac8
Fix test_client_routes_change_event
sylwiaszunejko Jan 28, 2026
55a05fd
Bump SCYLLA_VERSION to 2026.1
sylwiaszunejko Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

@mykaul mykaul Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not released yet...

Copy link
Collaborator Author

@sylwiaszunejko sylwiaszunejko Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my mistake, I saw it on driver matrix and locally with this setting I was able to successfully run this test

Copy link
Collaborator Author

@sylwiaszunejko sylwiaszunejko Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the first version that supports CLIENT_ROUTES_CHANGE?

Copy link
Collaborator Author

@sylwiaszunejko sylwiaszunejko Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, it is 2026.1.0, so we need to use it at least for testing purposes in the PR, and remove the commit that bums the scylla version, before the merge, is that ok?

strategy:
fail-fast: false
matrix:
Expand Down
16 changes: 5 additions & 11 deletions tests/integration/standard/test_control_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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 = [
Expand All @@ -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"
},
Expand All @@ -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"
}
Expand All @@ -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()
Loading