From ae9f5a00f036ab8a118c19fd8fa1cfc2616d19eb Mon Sep 17 00:00:00 2001 From: David Roberts Date: Tue, 24 Sep 2019 14:35:46 +0100 Subject: [PATCH] [TEST] Rename data-frames to transform in docs test cleanup The renaming of the tests in #46760 caused the cleanup between tests to be skipped. Fixes #43271 Fixes #47012 --- .../elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index ffdabd6d63399..14fef43344644 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -101,7 +101,7 @@ protected ClientYamlTestClient initClientYamlTestClient( @After public void cleanup() throws Exception { - if (isMachineLearningTest() || isDataFrameTest()) { + if (isMachineLearningTest() || isTransformTest()) { ESRestTestCase.waitForPendingTasks(adminClient()); } } @@ -111,9 +111,9 @@ protected boolean isMachineLearningTest() { return testName != null && (testName.contains("/ml/") || testName.contains("\\ml\\")); } - protected boolean isDataFrameTest() { + protected boolean isTransformTest() { String testName = getTestName(); - return testName != null && (testName.contains("/data-frames/") || testName.contains("\\data-frames\\")); + return testName != null && (testName.contains("/transform/") || testName.contains("\\transform\\")); } /**