You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2013/12/04 20:18:56 UTC
git commit: fix MoveTest
Updated Branches:
refs/heads/cassandra-1.2 f634ac7ea -> d8c4e89b3
fix MoveTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8c4e89b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8c4e89b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8c4e89b
Branch: refs/heads/cassandra-1.2
Commit: d8c4e89b3e85e8cb41a438963845cb10a923a3d6
Parents: f634ac7
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Wed Dec 4 20:17:30 2013 +0100
Committer: Marcus Eriksson <ma...@spotify.com>
Committed: Wed Dec 4 20:17:30 2013 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8c4e89b/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java
index e30bbde..07a9590 100644
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@ -109,6 +109,7 @@ public class MoveTest
// Third node leaves
ss.onChange(hosts.get(MOVING_NODE), ApplicationState.STATUS, valueFactory.moving(newToken));
+ PendingRangeCalculatorService.instance.blockUntilFinished();
assertTrue(tmd.isMoving(hosts.get(MOVING_NODE)));
@@ -197,6 +198,7 @@ public class MoveTest
ss.onChange(boot2,
ApplicationState.STATUS,
valueFactory.bootstrapping(Collections.<Token>singleton(keyTokens.get(7))));
+ PendingRangeCalculatorService.instance.blockUntilFinished();
// don't require test update every time a new keyspace is added to test/conf/cassandra.yaml
Map<String, AbstractReplicationStrategy> tableStrategyMap = new HashMap<String, AbstractReplicationStrategy>();