You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2019/02/19 16:14:59 UTC
[cassandra-dtest] branch master updated: Adapt tests to
materialized views disabled by default (CASSANDRA-14866)
This is an automated email from the ASF dual-hosted git repository.
adelapena 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 227ae5e Adapt tests to materialized views disabled by default (CASSANDRA-14866)
227ae5e is described below
commit 227ae5e7aca25c668340e467a35dfb0f7e1546fa
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Fri Feb 1 19:52:34 2019 +0000
Adapt tests to materialized views disabled by default (CASSANDRA-14866)
---
auth_test.py | 3 ++-
commitlog_test.py | 1 +
concurrent_schema_changes_test.py | 1 +
cqlsh_tests/cqlsh_tests.py | 3 ++-
jmx_test.py | 1 +
materialized_views_test.py | 4 ++++
pushed_notifications_test.py | 1 +
sstable_generation_loading_test.py | 1 +
upgrade_tests/cql_tests.py | 2 +-
9 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/auth_test.py b/auth_test.py
index 7c275e0..edcc936 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -1091,7 +1091,8 @@ class TestAuth(Tester):
"""
config = {'authenticator': 'org.apache.cassandra.auth.PasswordAuthenticator',
'authorizer': 'org.apache.cassandra.auth.CassandraAuthorizer',
- 'permissions_validity_in_ms': permissions_validity}
+ 'permissions_validity_in_ms': permissions_validity,
+ '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 19fd385..02c25dc 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -32,6 +32,7 @@ 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'})
fixture_dtest_setup.cluster.populate(1)
[self.node1] = fixture_dtest_setup.cluster.nodelist()
diff --git a/concurrent_schema_changes_test.py b/concurrent_schema_changes_test.py
index a975876..fba75e4 100644
--- a/concurrent_schema_changes_test.py
+++ b/concurrent_schema_changes_test.py
@@ -247,6 +247,7 @@ class TestConcurrentSchemaChanges(Tester):
create materialized views across multiple threads concurrently
"""
cluster = self.cluster
+ cluster.set_configuration_options({'enable_materialized_views': 'true'})
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
session = self.cql_connection(node1)
diff --git a/cqlsh_tests/cqlsh_tests.py b/cqlsh_tests/cqlsh_tests.py
index e5c601c..ba30b75 100644
--- a/cqlsh_tests/cqlsh_tests.py
+++ b/cqlsh_tests/cqlsh_tests.py
@@ -802,9 +802,9 @@ VALUES (4, blobAsInt(0x), '', blobAsBigint(0x), 0x, blobAsBoolean(0x), blobAsDec
"""
@jira_ticket CASSANDRA-9961
"""
+ self.cluster.set_configuration_options({'enable_materialized_views': 'true'})
self.cluster.populate(1)
self.cluster.start(wait_for_binary_proto=True)
- node1, = self.cluster.nodelist()
self.execute(
cql="""
@@ -1533,6 +1533,7 @@ Tracing session:""")
Test operations on a materialized view: create, describe, select from, drop, create using describe output.
@jira_ticket CASSANDRA-9961 and CASSANDRA-10348
"""
+ self.cluster.set_configuration_options({'enable_materialized_views': 'true'})
self.cluster.populate(1)
self.cluster.start(wait_for_binary_proto=True)
node1, = self.cluster.nodelist()
diff --git a/jmx_test.py b/jmx_test.py
index 76d4c06..caf1d04 100644
--- a/jmx_test.py
+++ b/jmx_test.py
@@ -108,6 +108,7 @@ class TestJMX(Tester):
Test that the right mbeans are created and released when creating mvs
"""
cluster = self.cluster
+ cluster.set_configuration_options({'enable_materialized_views': 'true'})
cluster.populate(1)
node = cluster.nodelist()[0]
remove_perf_disable_shared_mem(node)
diff --git a/materialized_views_test.py b/materialized_views_test.py
index feac99e..009ca16 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -53,6 +53,7 @@ class TestMaterializedViews(Tester):
def prepare(self, user_table=False, rf=1, options=None, nodes=3, install_byteman=False, **kwargs):
cluster = self.cluster
+ cluster.set_configuration_options({'enable_materialized_views': 'true'})
cluster.populate([nodes, 0], install_byteman=install_byteman)
if options:
cluster.set_configuration_options(values=options)
@@ -2316,6 +2317,7 @@ class TestMaterializedViews(Tester):
@jira_ticket CASSANDRA-9664
"""
cluster = self.cluster
+ cluster.set_configuration_options({'enable_materialized_views': 'true'})
cluster.populate(3).start()
node1 = cluster.nodelist()[0]
session = self.patient_cql_connection(node1, consistency_level=ConsistencyLevel.QUORUM)
@@ -2672,6 +2674,7 @@ class TestMaterializedViewsConsistency(Tester):
def prepare(self, user_table=False):
cluster = self.cluster
+ cluster.set_configuration_options({'enable_materialized_views': 'true'})
cluster.populate(3).start()
node2 = cluster.nodelist()[1]
@@ -2863,6 +2866,7 @@ class TestMaterializedViewsLockcontention(Tester):
def _prepare_cluster(self):
self.cluster.populate(1)
+ self.cluster.set_configuration_options({'enable_materialized_views': 'true'})
self.supports_v5_protocol = self.supports_v5_protocol(self.cluster.version())
self.protocol_version = 5 if self.supports_v5_protocol else 4
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index 3447fdc..40ae18f 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -291,6 +291,7 @@ class TestPushedNotifications(Tester):
Creating, updating and dropping a keyspace, a table and a materialized view
will generate the correct schema change notifications.
"""
+ self.cluster.set_configuration_options({'enable_materialized_views': 'true'})
self.cluster.populate(2).start(wait_for_binary_proto=True)
node1, node2 = self.cluster.nodelist()
diff --git a/sstable_generation_loading_test.py b/sstable_generation_loading_test.py
index 119f078..906ad5c 100644
--- a/sstable_generation_loading_test.py
+++ b/sstable_generation_loading_test.py
@@ -336,6 +336,7 @@ class TestSSTableGenerationAndLoading(TestBaseSStableLoader):
@jira_ticket CASSANDRA-11275
"""
def create_schema_with_mv(session, ks, compression):
+ self.cluster.nodelist()[0].set_configuration_options({'enable_materialized_views': 'true'})
self.create_schema(session, ks, compression)
# create a materialized view
session.execute("CREATE MATERIALIZED VIEW mv1 AS "
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index 580addc..a03cf9c 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -5500,7 +5500,7 @@ class TestCQL(UpgradeTester):
Test that creates and populate a simple materialized view.
@jira_ticket CASSANDRA-13382
"""
- cursor = self.prepare()
+ cursor = self.prepare(extra_config_options={'enable_materialized_views': 'true'})
cursor.execute("CREATE KEYSPACE foo WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}")
cursor.execute("CREATE TABLE foo.test1 (k int, t int, v int, PRIMARY KEY(k, t))")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org