diff options
author | jonmv <venstad@gmail.com> | 2022-04-22 15:26:26 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-04-22 15:26:26 +0200 |
commit | 4f026b9b114ecc095cf76b50acdc2186cbfcd280 (patch) | |
tree | ebdae02c469aa9890b0aec12155d26828a8f2a98 | |
parent | 1b011a9a5fb1ee0d112ef1b16a6633e8b0cf8314 (diff) |
Unignore more tests—they look like all the others—and lower timeout
2 files changed, 1 insertions, 5 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java index 37fe3e28a5d..2ff48e00d0f 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java @@ -26,8 +26,6 @@ public class DatabaseTest extends FleetControllerTest { private static final Logger log = Logger.getLogger(DatabaseTest.class.getName()); - // These tests work in isolation but causes other tests to hang - @Ignore @Test public void testWantedStatesInZooKeeper() throws Exception { startingTest("DatabaseTest::testWantedStatesInZooKeeper"); @@ -82,8 +80,6 @@ public class DatabaseTest extends FleetControllerTest { assertWantedStates(wantedStates); } - // These tests work in isolation but causes other tests to hang - @Ignore @Test public void testWantedStateOfUnknownNode() throws Exception { startingTest("DatabaseTest::testWantedStatesOfUnknownNode"); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java index c56b3bbdc69..a5eeb69e126 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java @@ -84,7 +84,7 @@ public abstract class FleetControllerTest implements Waiter { static { LogSetup.initVespaLogging("fleetcontroller"); - timeoutS = 120; + timeoutS = 30; timeoutMS = timeoutS * 1000; } |