From 3572cff0a89d69b1ed20f197e6b2f17b40dff5bc Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 16 Feb 2017 14:28:06 +0100 Subject: [PATCH] [TEST] slightly changed workaround cleanup for ml integ tests. Original commit: elastic/x-pack-elasticsearch@3eba1e76abc781554d746fbbeadc95c4e6c07233 --- .../org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java | 1 + .../org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java index 9684115fdd4..2f5cdb2b5a5 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java @@ -57,6 +57,7 @@ public class TooManyJobsIT extends BaseMlIntegTestCase { assertEquals(JobState.OPENED, task.getStatus()); OpenJobAction.Request openJobRequest = (OpenJobAction.Request) task.getRequest(); assertEquals("1", openJobRequest.getJobId()); + cleanupWorkaround(1); } public void testSingleNode() throws Exception { diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java index dab6a75a1aa..55de9c375ad 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java @@ -118,6 +118,8 @@ public abstract class BaseMlIntegTestCase extends SecurityIntegTestCase { internalCluster().stopRandomDataNode(); } internalCluster().startNode(Settings.builder().put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false)); + ensureStableCluster(1); + cluster().wipe(Collections.emptySet()); } private void deleteAllDatafeeds(Client client) throws Exception {