Add back and add timeout for tests
@@ -16,6 +16,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
+import org.junit.rules.Timeout;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +40,9 @@ public class MasterElectionTest extends FleetControllerTest {
@Rule
public TestRule cleanupZookeeperLogsOnSuccess = new CleanupZookeeperLogsOnSuccess();
+ @Rule
+ public Timeout globalTimeout= Timeout.seconds(120);
+
private static int defaultZkSessionTimeoutInMillis() { return 30_000; }
protected void setUpFleetController(int count, boolean useFakeTimer, FleetControllerOptions options) throws Exception {
@@ -116,6 +120,7 @@ public class MasterElectionTest extends FleetControllerTest {
/** Ignored for unknown reasons */
@Test
+ @Ignore
public void testMasterElection() throws Exception {
startingTest("MasterElectionTest::testMasterElection");
log.log(Level.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()");
