summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-06-12 13:39:18 +0200
committerGitHub <noreply@github.com>2017-06-12 13:39:18 +0200
commita035639a68c5ab46b6f886611bbae107ef052881 (patch)
treee1dd24813390b1c209171d92c31a0c536e4d06f1
parente54857bf484158e84e3f13ce44ca7b8ad0ff71aa (diff)
parent6b18a2f5cff2d6cac6be8ea011b0ad613ee2f672 (diff)
Merge pull request #2706 from yahoo/gjoranv/ignore-hanging-test
Ignore test that hangs on mac.
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java1
1 files changed, 1 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 a298be2a035..c683a9a1716 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
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+@Ignore
public class MasterElectionTest extends FleetControllerTest {
private static Logger log = Logger.getLogger(MasterElectionTest.class.getName());