Repository: hbase Updated Branches: refs/heads/master c5c395b68 -> 52e35b447
Add timeout on TestDefaultLoadBalancer#testBalancerCluster to see if we can stop it hanging as a zombie in precommit builds Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/52e35b44 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/52e35b44 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/52e35b44 Branch: refs/heads/master Commit: 52e35b4473e6b281de0b5ee967cf18b3948fa3d2 Parents: c5c395b Author: stack <st...@apache.org> Authored: Wed Dec 3 11:13:36 2014 -0800 Committer: stack <st...@apache.org> Committed: Wed Dec 3 11:13:36 2014 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/52e35b44/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java index d905c26..817730b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java @@ -109,7 +109,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { * * @throws Exception */ - @Test + @Test (timeout=60000) public void testBalanceCluster() throws Exception { for (int[] mockCluster : clusterStateMocks) {
