From c01e41619ff2b6f4ee33f245016a770ef9bf74b3 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 9 Jul 2019 14:40:23 +0100 Subject: [PATCH 1/4] Wait for pending tasks --- .../smoketest/DocsClientYamlTestSuiteIT.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index e87df16264e94..7bec585a3c447 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -33,6 +33,7 @@ import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.yaml.ClientYamlDocsTestClient; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ClientYamlTestClient; @@ -41,6 +42,7 @@ import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; import org.elasticsearch.test.rest.yaml.section.ExecutableSection; +import org.junit.After; import java.io.IOException; import java.util.ArrayList; @@ -97,6 +99,24 @@ protected ClientYamlTestClient initClientYamlTestClient( return new ClientYamlDocsTestClient(restSpec, restClient, hosts, esVersion, masterVersion, this::getClientBuilderWithSniffedHosts); } + @After + public void cleanup() throws Exception { + if (isMachineLearningTest() || isDataFrameTest()) { + logger.info("{}: waiting for pending tasks"); + ESRestTestCase.waitForPendingTasks(adminClient()); + } + } + + protected boolean isMachineLearningTest() { + String testName = getTestName(); + return testName != null && (testName.contains("=ml/") || testName.contains("=ml\\")); + } + + protected boolean isDataFrameTest() { + String testName = getTestName(); + return testName != null && (testName.contains("=data_frames/") || testName.contains("=data_frames\\")); + } + /** * Compares the results of running two analyzers against many random * strings. The goal is to figure out if two anlayzers are "the same" by From 442b451e1dae174b6607803c94a2c3fc5fe93a29 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 9 Jul 2019 14:40:32 +0100 Subject: [PATCH 2/4] Revert "Mute put job docs test" This reverts commit 071b6528740468e980b556c5a88346bb6596cbc6. --- docs/reference/ml/apis/put-job.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/ml/apis/put-job.asciidoc b/docs/reference/ml/apis/put-job.asciidoc index ea92bf94d695c..d48daff84be65 100644 --- a/docs/reference/ml/apis/put-job.asciidoc +++ b/docs/reference/ml/apis/put-job.asciidoc @@ -116,7 +116,6 @@ PUT _ml/anomaly_detectors/total-requests } -------------------------------------------------- // CONSOLE -// TEST[skip: https://github.com/elastic/elasticsearch/issues/43271] When the job is created, you receive the following results: [source,js] From dd72e837db3d61591e22bf6274da059b61967fa2 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 9 Jul 2019 14:41:04 +0100 Subject: [PATCH 3/4] Revert "Mute put-transform docs test" This reverts commit 2f9e8a8317dad5e87d0ca450cfa963a47f1e1695. --- docs/reference/data-frames/apis/put-transform.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/data-frames/apis/put-transform.asciidoc b/docs/reference/data-frames/apis/put-transform.asciidoc index abc5779e12a88..39df759c9249b 100644 --- a/docs/reference/data-frames/apis/put-transform.asciidoc +++ b/docs/reference/data-frames/apis/put-transform.asciidoc @@ -110,7 +110,7 @@ PUT _data_frame/transforms/ecommerce_transform } -------------------------------------------------- // CONSOLE -// TEST[skip: https://github.com/elastic/elasticsearch/issues/43271] +// TEST[setup:kibana_sample_data_ecommerce] When the transform is created, you receive the following results: [source,js] From 4f7d8bc995c9552630c35c16667c79c4bc99f103 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 9 Jul 2019 15:37:41 +0100 Subject: [PATCH 4/4] Remove debug logging and fix test type checks --- .../elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java | 5 ++--- 1 file changed, 2 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 7bec585a3c447..ffdabd6d63399 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -102,19 +102,18 @@ protected ClientYamlTestClient initClientYamlTestClient( @After public void cleanup() throws Exception { if (isMachineLearningTest() || isDataFrameTest()) { - logger.info("{}: waiting for pending tasks"); ESRestTestCase.waitForPendingTasks(adminClient()); } } protected boolean isMachineLearningTest() { String testName = getTestName(); - return testName != null && (testName.contains("=ml/") || testName.contains("=ml\\")); + return testName != null && (testName.contains("/ml/") || testName.contains("\\ml\\")); } protected boolean isDataFrameTest() { String testName = getTestName(); - return testName != null && (testName.contains("=data_frames/") || testName.contains("=data_frames\\")); + return testName != null && (testName.contains("/data-frames/") || testName.contains("\\data-frames\\")); } /**