Skip to content

Commit e7cb651

Browse files
sylwiaszunejkodkropachev
authored andcommitted
tests: xfail tests on Scylla version without indexes tablet support
Secondary indexes are not supported on base tables with tablets for Scylla versions < 2026.1.
1 parent 2b5dd16 commit e7cb651

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

tests/integration/cqlengine/query/test_named.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from tests.integration.cqlengine.query.test_queryset import BaseQuerySetUsage
2828

2929

30-
from tests.integration import BasicSharedKeyspaceUnitTestCase, greaterthanorequalcass30, requires_collection_indexes
30+
from tests.integration import BasicSharedKeyspaceUnitTestCase, greaterthanorequalcass30, requires_collection_indexes, xfail_scylla_version_lt
3131
import pytest
3232

3333

@@ -292,6 +292,8 @@ def tearDownClass(cls):
292292
super(TestNamedWithMV, cls).tearDownClass()
293293

294294
@greaterthanorequalcass30
295+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Materialized views and secondary indexes are not supported on base tables with tablets.',
296+
scylla_version='2026.1')
295297
@execute_count(5)
296298
def test_named_table_with_mv(self):
297299
"""

tests/integration/standard/test_metadata.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def test_dense_compact_storage(self):
449449
self.check_create_statement(tablemeta, create_statement)
450450

451451
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Counters are not yet supported with tablets',
452-
oss_scylla_version="7.0", ent_scylla_version="2026.1")
452+
scylla_version="2026.1")
453453
def test_counter(self):
454454
create_statement = (
455455
"CREATE TABLE {keyspace}.{table} ("
@@ -725,7 +725,7 @@ def test_refresh_table_metadata(self):
725725

726726
@greaterthanorequalcass30
727727
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
728-
oss_scylla_version="7.0", ent_scylla_version="2026.1")
728+
scylla_version="2026.1")
729729
def test_refresh_metadata_for_mv(self):
730730
"""
731731
test for synchronously refreshing materialized view metadata
@@ -936,7 +936,7 @@ def test_refresh_user_aggregate_metadata(self):
936936
@greaterthanorequalcass30
937937
@requires_collection_indexes
938938
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
939-
oss_scylla_version="7.0", ent_scylla_version="2026.1")
939+
scylla_version="2026.1")
940940
def test_multiple_indices(self):
941941
"""
942942
test multiple indices on the same column.
@@ -971,7 +971,7 @@ def test_multiple_indices(self):
971971

972972
@greaterthanorequalcass30
973973
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
974-
oss_scylla_version="7.0", ent_scylla_version="2026.1")
974+
scylla_version="2026.1")
975975
def test_table_extensions(self):
976976
s = self.session
977977
ks = self.keyspace_name
@@ -1204,8 +1204,8 @@ def test_export_keyspace_schema_udts(self):
12041204
cluster.shutdown()
12051205

12061206
@greaterthancass21
1207-
@xfail_scylla_version_lt(reason='scylladb/scylladb#10707 - Column name in CREATE INDEX is not quoted',
1208-
scylla_version="2023.1.1")
1207+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
1208+
scylla_version="2026.1")
12091209
def test_case_sensitivity(self):
12101210
"""
12111211
Test that names that need to be escaped in CREATE statements are
@@ -1465,6 +1465,8 @@ def create_basic_table(self):
14651465
def drop_basic_table(self):
14661466
self.session.execute("DROP TABLE %s" % self.table_name)
14671467

1468+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
1469+
scylla_version="2026.1")
14681470
def test_index_updates(self):
14691471
self.create_basic_table()
14701472

@@ -1506,6 +1508,8 @@ def test_index_updates(self):
15061508
assert 'a_idx' not in ks_meta.indexes
15071509
assert 'b_idx' not in ks_meta.indexes
15081510

1511+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
1512+
scylla_version="2026.1")
15091513
def test_index_follows_alter(self):
15101514
self.create_basic_table()
15111515

@@ -2047,6 +2051,8 @@ def test_bad_table(self):
20472051
assert m._exc_info[0] is self.BadMetaException
20482052
assert "/*\nWarning:" in m.export_as_string()
20492053

2054+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
2055+
scylla_version="2026.1")
20502056
def test_bad_index(self):
20512057
self.session.execute('CREATE TABLE %s (k int PRIMARY KEY, v int)' % self.function_name)
20522058
self.session.execute('CREATE INDEX ON %s(v)' % self.function_name)
@@ -2138,6 +2144,8 @@ def test_dct_alias(self):
21382144

21392145

21402146
@greaterthanorequalcass30
2147+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
2148+
scylla_version="2026.1")
21412149
class MaterializedViewMetadataTestSimple(BasicSharedKeyspaceUnitTestCase):
21422150

21432151
def setUp(self):
@@ -2226,6 +2234,8 @@ def test_materialized_view_metadata_drop(self):
22262234

22272235

22282236
@greaterthanorequalcass30
2237+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Secondary indexes are not supported on base tables with tablets',
2238+
scylla_version="2026.1")
22292239
class MaterializedViewMetadataTestComplex(BasicSegregatedKeyspaceUnitTestCase):
22302240
def test_create_view_metadata(self):
22312241
"""

tests/integration/standard/test_query.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,8 @@ def test_inherit_first_rk_prepared_param(self):
11661166

11671167

11681168
@greaterthanorequalcass30
1169+
@xfail_scylla_version_lt(reason='scylladb/scylladb#22677 - Materialized views and secondary indexes are not supported on base tables with tablets.',
1170+
scylla_version='2026.1')
11691171
class MaterializedViewQueryTest(BasicSharedKeyspaceUnitTestCase):
11701172

11711173
def test_mv_filtering(self):

0 commit comments

Comments
 (0)