cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] git commit: fix MoveTest
Date Wed, 04 Dec 2013 19:19:12 GMT
Updated Branches:
  refs/heads/cassandra-2.0 1334f94e4 -> 32dbe5825


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-2.0
Commit: d8c4e89b3e85e8cb41a438963845cb10a923a3d6
Parents: f634ac7
Author: Marcus Eriksson <marcuse@spotify.com>
Authored: Wed Dec 4 20:17:30 2013 +0100
Committer: Marcus Eriksson <marcuse@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>();


Mime
View raw message