This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new af5d69e Pass enable_scripted_user_defined_functions to clusters with
version >= 3.0 patch by Ekaterina Dimitrova, review by Brandon Williams for
CASSANDRA-16736
af5d69e is described below
commit af5d69e7efbab5a609bf0556b2c59f58e7acc5a2
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Wed Jul 14 19:58:18 2021 -0400
Pass enable_scripted_user_defined_functions to clusters with version >= 3.0
patch by Ekaterina Dimitrova, review by Brandon Williams for CASSANDRA-16736
---
cqlsh_tests/test_cqlsh.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 2e1a659..a5e31e6 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -97,10 +97,14 @@ class TestCqlsh(Tester, CqlshMixin):
# override cluster options to enable user defined functions
# currently only needed for test_describe
@pytest.fixture
- def fixture_dtest_setup_overrides(self):
+ def fixture_dtest_setup_overrides(self, dtest_config):
dtest_setup_overrides = DTestSetupOverrides()
- dtest_setup_overrides.cluster_options =
ImmutableMapping({'enable_user_defined_functions': 'true',
-
'enable_scripted_user_defined_functions': 'true'})
+ if dtest_config.cassandra_version_from_build >= '3.0':
+ dtest_setup_overrides.cluster_options =
ImmutableMapping({'enable_user_defined_functions': 'true',
+
'enable_scripted_user_defined_functions': 'true'})
+ else:
+ dtest_setup_overrides.cluster_options =
ImmutableMapping({'enable_user_defined_functions': 'true'})
+
return dtest_setup_overrides
@classmethod
@@ -892,6 +896,7 @@ VALUES (4, blobAsInt(0x), '', blobAsBigint(0x), 0x,
blobAsBoolean(0x), blobAsDec
assert "'min_threshold': '10'" in stdout
assert "'max_threshold': '100'" in stdout
+ @since('3.0')
def test_describe_functions(self, fixture_dtest_setup_overrides):
"""Test DESCRIBE statements for functions and aggregate functions"""
self.cluster.populate(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
