This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit c1a59823ef1595a3918e5b476b286f81672eb2cb Author: Adam Holmberg <[email protected]> AuthorDate: Fri Dec 18 14:37:18 2020 -0800 Fix upgrade python dtest test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes patch by Adam Holmberg; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-16332 --- upgrade_tests/cql_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py index 1ce95ba..5c9ec78 100644 --- a/upgrade_tests/cql_tests.py +++ b/upgrade_tests/cql_tests.py @@ -4109,6 +4109,7 @@ class TestCQL(UpgradeTester): def test_static_columns_with_2i(self): cursor = self.prepare() + initial_version = self.cluster.version() cursor.execute(""" CREATE TABLE test ( @@ -4133,8 +4134,8 @@ class TestCQL(UpgradeTester): assert_all(cursor, "SELECT * FROM test WHERE v = 1", [[0, 0, 42, 1], [0, 1, 42, 1]]) assert_all(cursor, "SELECT p, s FROM test WHERE v = 1", [[0, 42], [1, 42]]) assert_all(cursor, "SELECT p FROM test WHERE v = 1", [[0], [1]]) - # We don't support that - assert_invalid(cursor, "SELECT s FROM test WHERE v = 1") + if initial_version >= LooseVersion('3.11.7'): # See CASSANDRA-16332. This fails with a known limitation on versions before 3.11.7 (CASSANDRA-14242) + assert_all(cursor, "SELECT s FROM test WHERE v = 1", [[42], [42]]) @since('2.1') def test_static_columns_with_distinct(self): --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
