You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/08 20:47:04 UTC
[1/2] git commit: Fix test/system/test_thrift_server.py
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 cd37d07ba -> b3bb7fcc3
Fix test/system/test_thrift_server.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2dcaf26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2dcaf26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2dcaf26
Branch: refs/heads/cassandra-2.0
Commit: b2dcaf269a17acaf9755a14f867844efb56f48e7
Parents: 266f6b7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 8 21:16:55 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 8 21:16:55 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2dcaf26/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index dbbc1bf..7655958 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -1222,7 +1222,7 @@ class TestMutations(ThriftTester):
def test_describe_keyspace(self):
kspaces = client.describe_keyspaces()
- assert len(kspaces) == 5, kspaces # ['Keyspace2', 'Keyspace1', 'system', 'system_traces', 'system_auth']
+ assert len(kspaces) == 4, kspaces # ['Keyspace2', 'Keyspace1', 'system', 'system_traces']
sysks = client.describe_keyspace("system")
assert sysks in kspaces
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3bb7fcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3bb7fcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3bb7fcc
Branch: refs/heads/cassandra-2.0
Commit: b3bb7fcc3c38dda424e1b041bcde2e43dbebc4eb
Parents: cd37d07 b2dcaf2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 8 21:20:21 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 8 21:46:51 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3bb7fcc/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --cc test/system/test_thrift_server.py
index 7ecc8f1,7655958..f10496b
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@@ -24,7 -24,7 +24,6 @@@ from . import thrift_client as clien
from thrift.Thrift import TApplicationException
from ttypes import *
--from constants import VERSION
def _i64(n):
@@@ -1318,8 -1236,8 +1317,6 @@@ class TestMutations(ThriftTester)
assert cf0.comparator_type == "org.apache.cassandra.db.marshal.BytesType"
def test_describe(self):
-- server_version = client.describe_version()
-- assert server_version == VERSION, (server_version, VERSION)
assert client.describe_cluster_name() == 'Test Cluster'
def test_describe_ring(self):