This is an automated email from the ASF dual-hosted git repository.
mshuler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/master by this push:
new 8d2bbf2 Fix 2.2 dtests that error on materialized view config
8d2bbf2 is described below
commit 8d2bbf2b5a673fa0d4a52af8dc973897be70924a
Author: Michael Shuler <[email protected]>
AuthorDate: Thu Jun 6 17:29:53 2019 -0500
Fix 2.2 dtests that error on materialized view config
CASSANDRA-14866 set 'enable_materialized_views: true' without checking
the build version, so set only on >= 3.0
---
auth_test.py | 5 +++--
commitlog_test.py | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/auth_test.py b/auth_test.py
index edcc936..4244487 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -1091,8 +1091,9 @@ class TestAuth(Tester):
"""
config = {'authenticator':
'org.apache.cassandra.auth.PasswordAuthenticator',
'authorizer':
'org.apache.cassandra.auth.CassandraAuthorizer',
- 'permissions_validity_in_ms': permissions_validity,
- 'enable_materialized_views': 'true'}
+ 'permissions_validity_in_ms': permissions_validity}
+ if self.dtest_config.cassandra_version_from_build >= '3.0':
+ config['enable_materialized_views'] = 'true'
if self.dtest_config.cassandra_version_from_build >= '4.0':
config['network_authorizer'] =
'org.apache.cassandra.auth.CassandraNetworkAuthorizer'
self.cluster.set_configuration_options(values=config)
diff --git a/commitlog_test.py b/commitlog_test.py
index 02c25dc..b0c769f 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -32,7 +32,8 @@ class TestCommitLog(Tester):
@pytest.fixture(scope='function', autouse=True)
def fixture_set_cluster_settings(self, fixture_dtest_setup):
-
fixture_dtest_setup.cluster.set_configuration_options({'enable_materialized_views':
'true'})
+ if fixture_dtest_setup.dtest_config.cassandra_version_from_build >=
'3.0':
+
fixture_dtest_setup.cluster.set_configuration_options({'enable_materialized_views':
'true'})
fixture_dtest_setup.cluster.populate(1)
[self.node1] = fixture_dtest_setup.cluster.nodelist()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
