Skip to content

Commit b56fa6d

Browse files
committed
tests: enable vector integration tests on Scylla 2025.4+
Vector type is supported on Scylla 2025.4 and above. Enable the integration tests. Tested locally against both 2025.4.2 and 2026.1 and they pass. Signed-off-by: Yaniv Kaul <yaniv.kaul@scylladb.com>
1 parent bead89b commit b56fa6d

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

tests/integration/__init__.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,17 @@ def xfail_scylla_version(filter: Callable[[Version], bool], reason: str, *args,
279279
greaterthanorequalcass3_11 = unittest.skipUnless(CASSANDRA_VERSION >= Version('3.11'), 'Cassandra version 3.11 or greater required')
280280
greaterthanorequalcass40 = unittest.skipUnless(CASSANDRA_VERSION >= Version('4.0'), 'Cassandra version 4.0 or greater required')
281281
greaterthanorequalcass50 = unittest.skipUnless(CASSANDRA_VERSION >= Version('5.0-beta'), 'Cassandra version 5.0 or greater required')
282+
def _is_cass50_or_scylla_2025_4_plus():
283+
if CASSANDRA_VERSION >= Version('5.0-beta'):
284+
return True
285+
if SCYLLA_VERSION is None:
286+
return False
287+
return Version(get_scylla_version(SCYLLA_VERSION)) >= Version('2025.4')
288+
289+
greaterthanorequalcass50_or_scylla_2025_4 = unittest.skipUnless(
290+
_is_cass50_or_scylla_2025_4_plus(),
291+
'Cassandra >= 5.0 or Scylla >= 2025.4 required'
292+
)
282293
lessthanorequalcass40 = unittest.skipUnless(CASSANDRA_VERSION <= Version('4.0'), 'Cassandra version less or equal to 4.0 required')
283294
lessthancass40 = unittest.skipUnless(CASSANDRA_VERSION < Version('4.0'), 'Cassandra version less than 4.0 required')
284295
lessthancass30 = unittest.skipUnless(CASSANDRA_VERSION < Version('3.0'), 'Cassandra version less then 3.0 required')

tests/integration/standard/test_types.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040

4141
from tests.integration import use_singledc, execute_until_pass, notprotocolv1, \
4242
BasicSharedKeyspaceUnitTestCase, greaterthancass21, lessthancass30, \
43-
greaterthanorequalcass3_10, TestCluster, requires_composite_type, greaterthanorequalcass50
43+
greaterthanorequalcass3_10, TestCluster, requires_composite_type, \
44+
greaterthanorequalcass50_or_scylla_2025_4
4445
from tests.integration.datatype_utils import update_datatypes, PRIMITIVE_DATATYPES, COLLECTION_TYPES, PRIMITIVE_DATATYPES_KEYS, \
4546
get_sample, get_all_samples, get_collection_sample
4647
import pytest
@@ -984,7 +985,7 @@ def run_inserts_at_version(self, proto_ver):
984985
finally:
985986
session.cluster.shutdown()
986987

987-
@greaterthanorequalcass50
988+
@greaterthanorequalcass50_or_scylla_2025_4
988989
class TypeTestsVector(BasicSharedKeyspaceUnitTestCase):
989990

990991
def _get_first_j(self, rs):

0 commit comments

Comments
 (0)