Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions tests/integration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ def _has_vector_type():
# 1. unittest doesn't skip setUpClass when used on class and we need it sometimes
# 2. unittest doesn't have conditional xfail, and I prefer to use pytest than custom decorator
# 3. unittest doesn't have a reason argument, so you don't see the reason in pytest report
requires_scylla = pytest.mark.skipif(SCYLLA_VERSION is None, reason='Requires ScyllaDB')
requires_collection_indexes = pytest.mark.skipif(SCYLLA_VERSION is not None and Version(get_scylla_version(SCYLLA_VERSION)) < Version('5.2'),
reason='Scylla supports collection indexes from 5.2 onwards')
requires_custom_indexes = pytest.mark.skipif(SCYLLA_VERSION is not None,
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/standard/test_application_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from cassandra.application_info import ApplicationInfo
from tests.integration import (TestCluster, get_client_options, use_single_node, remove_cluster,
xfail_scylla_version_lt)
requires_scylla, xfail_scylla_version_lt)


def setup_module():
Expand All @@ -27,6 +27,7 @@ def teardown_module():
remove_cluster()


@requires_scylla
@xfail_scylla_version_lt(reason='scylladb/scylla-enterprise#5467 - system.client_options is not yet supported',
scylla_version="2026.1.0")
class ApplicationInfoTest(unittest.TestCase):
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/standard/test_driver_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
ConstantSpeculativeExecutionPolicy, FallthroughRetryPolicy)
from tests.driver_config_schema import validate_report
from tests.integration import (TestCluster, get_client_options, use_single_node, remove_cluster,
xfail_scylla_version_lt)
requires_scylla, xfail_scylla_version_lt)


def setup_module():
Expand Down Expand Up @@ -164,6 +164,7 @@ def _reported_config(cluster):
return validate_report(reports[0])


@requires_scylla
@xfail_scylla_version_lt(reason='scylladb/scylla-enterprise#5467 - system.client_options is not yet supported',
scylla_version="2026.1.0")
class DriverConfigReportingTest(unittest.TestCase):
Expand Down