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 2013/06/02 01:32:24 UTC
[1/2] git commit: Fix
test_thrift_server.TestMutations.test_describe_token_map
Updated Branches:
refs/heads/trunk 3d1cfd1c9 -> 37f0c8c91
Fix test_thrift_server.TestMutations.test_describe_token_map
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/452b1bef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/452b1bef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452b1bef
Branch: refs/heads/trunk
Commit: 452b1bef56d150085ad6a9f0e758c112f2c07eec
Parents: 079ae68
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Jun 2 00:47:19 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Jun 2 00:47:19 2013 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/452b1bef/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index 20fcacb..dbbc1bf 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -1244,13 +1244,13 @@ class TestMutations(ThriftTester):
assert list(client.describe_ring('Keyspace1'))[0].endpoints == ['127.0.0.1']
def test_describe_token_map(self):
- # test/conf/cassandra.yaml specifies org.apache.cassandra.dht.CollatingOrderPreservingPartitioner
- # which uses BytesToken, so this just tests that the string representation of the token
+ # test/conf/cassandra.yaml specifies org.apache.cassandra.dht.ByteOrderedPartitioner
+ # which uses BytesToken, so this just tests that the string representation of the token
# matches a regex pattern for BytesToken.toString().
ring = client.describe_token_map().items()
assert len(ring) == 1
token, node = ring[0]
- assert re.match("^Token\(bytes\[[0-9A-Fa-f]{32}\]\)", token)
+ assert re.match("[0-9A-Fa-f]{32}", token)
assert node == '127.0.0.1'
def test_describe_partitioner(self):
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Conflicts:
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/37f0c8c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f0c8c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f0c8c9
Branch: refs/heads/trunk
Commit: 37f0c8c91f1ea6ad2d3dc18f3040f39c7137217c
Parents: 3d1cfd1 452b1be
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Jun 2 02:32:10 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Jun 2 02:32:10 2013 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37f0c8c9/test/system/test_thrift_server.py
----------------------------------------------------------------------