From 29ae49ba11c899a0595f97c5749614d5d30b5558 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Thu, 15 Aug 2024 13:43:36 -0400 Subject: [PATCH] Make test_compression_disabled expect proper value for scylla --- tests/integration/standard/test_metadata.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py index 86f48f88d5..dcd4fa729c 100644 --- a/tests/integration/standard/test_metadata.py +++ b/tests/integration/standard/test_metadata.py @@ -40,7 +40,7 @@ greaterthancass21, assert_startswith, greaterthanorequalcass40, greaterthanorequaldse67, lessthancass40, TestCluster, DSE_VERSION, requires_java_udf, requires_composite_type, - requires_collection_indexes, xfail_scylla) + requires_collection_indexes, xfail_scylla, SCYLLA_VERSION) from tests.util import wait_until @@ -531,14 +531,14 @@ def test_collection_indexes(self): tablemeta = self.get_table_metadata() self.assertIn('(full(b))', tablemeta.export_as_string()) - #TODO: Fix Scylla or test - @xfail_scylla('Scylla prints `compression = {}` instead of `compression = {\'enabled\': \'false\'}`.') def test_compression_disabled(self): create_statement = self.make_create_statement(["a"], ["b"], ["c"]) create_statement += " WITH compression = {}" self.session.execute(create_statement) tablemeta = self.get_table_metadata() - expected = "compression = {}" if CASSANDRA_VERSION < Version("3.0") else "compression = {'enabled': 'false'}" + expected = "compression = {'enabled': 'false'}" + if SCYLLA_VERSION is not None or CASSANDRA_VERSION < Version("3.0"): + expected = "compression = {}" self.assertIn(expected, tablemeta.export_as_string()) def test_non_size_tiered_compaction(self):