summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2022-04-22 16:37:08 +0200
committerGitHub <noreply@github.com>2022-04-22 16:37:08 +0200
commit5e5331b98e0ddfbd0de0b30dc8da9c1b204d14da (patch)
tree8bd732f0c5cfc3f09c394fb690a680f442aa986c /clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
parent771214909ab54211d228e1273e8e476e49faa4b8 (diff)
parent4f026b9b114ecc095cf76b50acdc2186cbfcd280 (diff)
Merge pull request #22225 from vespa-engine/jonmv/clustercontroller-core-test-retries-and-random-cleanup
Jonmv/clustercontroller core test retries and random cleanup
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java')
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java4
1 files changed, 0 insertions, 4 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");