You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/07/20 21:01:39 UTC
[1/2] cassandra git commit: Ninja: update cqlsh completion tests for
CASSANDRA-8844
Repository: cassandra
Updated Branches:
refs/heads/trunk 5d9aab276 -> 29bd15ee9
Ninja: update cqlsh completion tests for CASSANDRA-8844
In CASSANDRA-8844, a new 'cdc' table option was added. The python
driver added this as a recognized option, which caused it to show up in
cqlsh autocomplete suggestions. However, the cqlsh tests were not
updated to match this.
This should fix the following failing tests:
- test_complete_in_create_table
- test_complete_in_create_columnfamily
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/584eae39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/584eae39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/584eae39
Branch: refs/heads/trunk
Commit: 584eae3910b303f755f3965403d744e588300482
Parents: 7fbe42a
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Jul 19 14:40:55 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jul 20 16:01:03 2016 -0500
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_completion.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/584eae39/pylib/cqlshlib/test/test_cqlsh_completion.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cqlsh_completion.py b/pylib/cqlshlib/test/test_cqlsh_completion.py
index 8485ff0..21eb088 100644
--- a/pylib/cqlshlib/test/test_cqlsh_completion.py
+++ b/pylib/cqlshlib/test/test_cqlsh_completion.py
@@ -595,7 +595,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
'memtable_flush_period_in_ms',
'read_repair_chance', 'CLUSTERING',
'COMPACT', 'caching', 'comment',
- 'min_index_interval', 'speculative_retry'])
+ 'min_index_interval', 'speculative_retry', 'cdc'])
self.trycompletions(prefix + ' new_table (col_a int PRIMARY KEY) WITH ',
choices=['bloom_filter_fp_chance', 'compaction',
'compression',
@@ -605,7 +605,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
'memtable_flush_period_in_ms',
'read_repair_chance', 'CLUSTERING',
'COMPACT', 'caching', 'comment',
- 'min_index_interval', 'speculative_retry'])
+ 'min_index_interval', 'speculative_retry', 'cdc'])
self.trycompletions(prefix + ' new_table (col_a int PRIMARY KEY) WITH bloom_filter_fp_chance ',
immediate='= ')
self.trycompletions(prefix + ' new_table (col_a int PRIMARY KEY) WITH bloom_filter_fp_chance = ',
@@ -653,7 +653,7 @@ class TestCqlshCompletion(CqlshCompletionCase):
'memtable_flush_period_in_ms',
'read_repair_chance', 'CLUSTERING',
'COMPACT', 'caching', 'comment',
- 'min_index_interval', 'speculative_retry'])
+ 'min_index_interval', 'speculative_retry', 'cdc'])
self.trycompletions(prefix + " new_table (col_a int PRIMARY KEY) WITH compaction = "
+ "{'class': 'DateTieredCompactionStrategy', '",
choices=['base_time_seconds', 'max_sstable_age_days',
@@ -669,7 +669,6 @@ class TestCqlshCompletion(CqlshCompletionCase):
'enabled', 'unchecked_tombstone_compaction',
'only_purge_repaired_tombstones'])
-
def test_complete_in_create_columnfamily(self):
self.trycompletions('CREATE C', choices=['COLUMNFAMILY', 'CUSTOM'])
self.trycompletions('CREATE CO', immediate='LUMNFAMILY ')
[2/2] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29bd15ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29bd15ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29bd15ee
Branch: refs/heads/trunk
Commit: 29bd15ee923d5fd8a8f34ad8fcd9a19bacbf4098
Parents: 5d9aab2 584eae3
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Jul 20 16:01:30 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jul 20 16:01:30 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------