Updated Branches: refs/heads/cassandra-1.2 ab5372f0f -> 2dd55c7d3 refs/heads/cassandra-2.0 fe571421d -> 7407cf981 refs/heads/trunk 65e09fa5b -> 4c0b4fa2e
fix race in LeaveAndBootstrapTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dd55c7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dd55c7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dd55c7d Branch: refs/heads/cassandra-1.2 Commit: 2dd55c7d31829b7746201fd86b647296b0c8ae58 Parents: ab5372f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Feb 7 10:37:36 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Feb 7 10:37:53 2014 -0600 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd55c7d/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index de7958f..c8a634a 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -108,6 +108,7 @@ public class LeaveAndBootstrapTest valueFactory.leaving(Collections.singleton(endpointTokens.get(LEAVING_NODE)))); assertTrue(tmd.isLeaving(hosts.get(LEAVING_NODE))); + Thread.sleep(100); // because there is a tight race between submit and blockUntilFinished PendingRangeCalculatorService.instance.blockUntilFinished(); AbstractReplicationStrategy strategy;
