cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Wed, 20 Jul 2016 02:03:13 GMT
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/f129dea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f129dea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f129dea8

Branch: refs/heads/trunk
Commit: f129dea8694ba2a7822748722294da40c9fc0de3
Parents: cc58285 8df6d4d
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Wed Jul 20 10:00:12 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Wed Jul 20 10:00:12 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                              |  2 ++
 pylib/cqlshlib/test/__init__.py          |  6 +++---
 pylib/cqlshlib/test/cassconnect.py       | 22 +++++++++++-----------
 pylib/cqlshlib/test/test_cqlsh_output.py | 14 +++++++-------
 4 files changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f129dea8/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f129dea8/pylib/cqlshlib/test/cassconnect.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f129dea8/pylib/cqlshlib/test/test_cqlsh_output.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/test/test_cqlsh_output.py
index a6290ff,9936f50..8c19e62
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@@ -552,8 -559,9 +552,8 @@@ class TestCqlshOutput(BaseTestCase)
                               "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR")
  
      def test_describe_keyspace_output(self):
 -        fullcqlver = cqlsh.DEFAULT_CQLVER
 -        with testrun_cqlsh(tty=True, cqlver=fullcqlver) as c:
 +        with testrun_cqlsh(tty=True) as c:
-             ks = get_test_keyspace()
+             ks = get_keyspace()
              qks = quote_name(ks)
              for cmd in ('describe keyspace', 'desc keyspace'):
                  for givename in ('system', '', qks):
@@@ -625,9 -633,9 +625,9 @@@
                  AND read_repair_chance = 0.0
                  AND speculative_retry = '99PERCENTILE';
  
-         """ % quote_name(get_test_keyspace()))
+         """ % quote_name(get_keyspace()))
  
 -        with testrun_cqlsh(tty=True, cqlver=cqlsh.DEFAULT_CQLVER) as c:
 +        with testrun_cqlsh(tty=True) as c:
              for cmdword in ('describe table', 'desc columnfamily'):
                  for semicolon in (';', ''):
                      output = c.cmd_and_response('%s has_all_types%s' % (cmdword, semicolon))
@@@ -643,9 -651,9 +643,9 @@@
              \n
          '''
  
-         ks = get_test_keyspace()
+         ks = get_keyspace()
  
 -        with testrun_cqlsh(tty=True, keyspace=None, cqlver=cqlsh.DEFAULT_CQLVER) as c:
 +        with testrun_cqlsh(tty=True, keyspace=None) as c:
  
              # when not in a keyspace
              for cmdword in ('DESCRIBE COLUMNFAMILIES', 'desc tables'):


Mime
View raw message