Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 1fe275c22 -> b0353dec7 refs/heads/master 5734ab133 -> d231b920e
ACCUMULO-3069 Make MACITest more resilient to tservers gradually starting Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0353dec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0353dec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0353dec Branch: refs/heads/1.6.1-SNAPSHOT Commit: b0353dec75d8702942a7b4e5fc0ccf35917da28a Parents: 1fe275c Author: Josh Elser <[email protected]> Authored: Wed Aug 20 18:05:55 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Wed Aug 20 18:05:55 2014 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterImplTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0353dec/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImplTest.java ---------------------------------------------------------------------- diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImplTest.java index 2bab291..b19d289 100644 --- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImplTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImplTest.java @@ -43,9 +43,6 @@ import org.junit.BeforeClass; import org.junit.Test; public class MiniAccumuloClusterImplTest { - - private static final Logger log = Logger.getLogger(MiniAccumuloClusterImplTest.class); - public static File testDir; private static MiniAccumuloClusterImpl accumulo; @@ -96,10 +93,15 @@ public class MiniAccumuloClusterImplTest { } } - @Test + @Test(timeout = 60000) public void saneMonitorInfo() throws Exception { - log.info("ensure monitor info includes some base information."); - MasterMonitorInfo stats = accumulo.getMasterMonitorInfo(); + MasterMonitorInfo stats; + while (true) { + stats = accumulo.getMasterMonitorInfo(); + if (null != stats.tServerInfo && stats.tServerInfo.size() == NUM_TSERVERS) { + break; + } + } List<MasterState> validStates = Arrays.asList(MasterState.values()); List<MasterGoalState> validGoals = Arrays.asList(MasterGoalState.values()); Assert.assertTrue("master state should be valid.", validStates.contains(stats.state));
