From e2144a2c415d4f3e662d36884964fd31dba417a9 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Fri, 30 Jan 2026 11:14:11 -0400 Subject: [PATCH] Remove redundant skip decorators for broadcast_rpc_port tests The skip decorators referencing issue #121 were unnecessary because: - test_control_connection_port_discovery: Already has @greaterthanorequalcass40 which skips for Scylla (mapped to Cassandra 3.11.4) - test_single_interface: The entire class has @greaterthanorequalcass40 - test_host_addresses: Port assertions are conditional on CASSANDRA_VERSION >= 4.0 Since Scylla's CASSANDRA_VERSION defaults to 3.11.4, these version checks already prevent the port-related assertions from running on Scylla. Fixes: https://github.com/scylladb/python-driver/issues/121 --- tests/integration/standard/test_control_connection.py | 2 -- tests/integration/standard/test_metadata.py | 8 ++++---- tests/integration/standard/test_single_interface.py | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/integration/standard/test_control_connection.py b/tests/integration/standard/test_control_connection.py index cb7820f0a6..9208ee885f 100644 --- a/tests/integration/standard/test_control_connection.py +++ b/tests/integration/standard/test_control_connection.py @@ -108,8 +108,6 @@ def test_get_control_connection_host(self): assert new_host1 != new_host2 - # TODO: enable after https://github.com/scylladb/python-driver/issues/121 is fixed - @unittest.skip('Fails on scylla due to the broadcast_rpc_port is None') @greaterthanorequalcass40 def test_control_connection_port_discovery(self): """ diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py index d3ccafd76d..c30e369d83 100644 --- a/tests/integration/standard/test_metadata.py +++ b/tests/integration/standard/test_metadata.py @@ -57,8 +57,6 @@ def setup_module(): class HostMetaDataTests(BasicExistingKeyspaceUnitTestCase): - # TODO: enable after https://github.com/scylladb/python-driver/issues/121 is fixed - @unittest.skip('Fails on scylla due to the broadcast_rpc_port is None') @local def test_host_addresses(self): """ @@ -85,8 +83,10 @@ def test_host_addresses(self): local_host = con.host # The control connection node should have the listen address set. - listen_addrs = [host.listen_address for host in self.cluster.metadata.all_hosts()] - assert local_host in listen_addrs + # Note: Scylla does not populate listen_address in system.local + if SCYLLA_VERSION is None: + listen_addrs = [host.listen_address for host in self.cluster.metadata.all_hosts()] + assert local_host in listen_addrs # The control connection node should have the broadcast_rpc_address set. rpc_addrs = [host.broadcast_rpc_address for host in self.cluster.metadata.all_hosts()] diff --git a/tests/integration/standard/test_single_interface.py b/tests/integration/standard/test_single_interface.py index 3fd90b9708..5fd9ef45d3 100644 --- a/tests/integration/standard/test_single_interface.py +++ b/tests/integration/standard/test_single_interface.py @@ -44,8 +44,6 @@ def tearDown(self): if self.cluster is not None: self.cluster.shutdown() - # TODO: enable after https://github.com/scylladb/python-driver/issues/121 is fixed - @unittest.skip('Fails on scylla due to the broadcast_rpc_port is None') def test_single_interface(self): """ Test that we can connect to a multiple hosts bound to a single interface.