commit af5d69e7efbab5a609bf0556b2c59f58e7acc5a2
author Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com> Wed Jul 14 19:58:18 2021 -0400
committer Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com> Tue Jul 20 14:52:39 2021 -0400
tree 09bba8f61600c330f3cafa4df03227b705e337db
parent 7bf5be87e1d37e9f9302f15b1b79a48b0082b521

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

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 @@
     # 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 @@
         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)