diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-10-02 09:41:25 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-10-02 09:41:25 +0200 |
commit | 7e6df870c13deaffcfd8368e79db1d537f5a3378 (patch) | |
tree | 0fef1f8c1a137dfeb596fd7bb8f3c2883718dfd0 | |
parent | 1a6f1eb56eb57b5300b676790bb8583ac4806e48 (diff) |
Add back @Ignore and add timeout for tests
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java index e517fb782ef..d14f6701288 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java @@ -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()"); |