From 3ed60df59de025d8b696ec600283c74897c9b3dd Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Tue, 15 Sep 2020 13:26:52 +0200 Subject: [PATCH] Re-enable resolve index multi cluster test (#62365) Backport of #62361 to 7.x branch. This test was fine and shouldn't have been muted. The test case class should have preserved data streams as part of #62205 Closes #62210 --- .../MultiClusterSearchWithSecurityYamlTestSuiteIT.java | 5 +++++ .../rest-api-spec/test/multi_cluster/100_resolve_index.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/x-pack/qa/multi-cluster-search-security/src/test/java/org/elasticsearch/xpack/security/MultiClusterSearchWithSecurityYamlTestSuiteIT.java b/x-pack/qa/multi-cluster-search-security/src/test/java/org/elasticsearch/xpack/security/MultiClusterSearchWithSecurityYamlTestSuiteIT.java index 011fe5be928..0fad472230d 100644 --- a/x-pack/qa/multi-cluster-search-security/src/test/java/org/elasticsearch/xpack/security/MultiClusterSearchWithSecurityYamlTestSuiteIT.java +++ b/x-pack/qa/multi-cluster-search-security/src/test/java/org/elasticsearch/xpack/security/MultiClusterSearchWithSecurityYamlTestSuiteIT.java @@ -26,6 +26,11 @@ public class MultiClusterSearchWithSecurityYamlTestSuiteIT extends ESClientYamlS return true; } + @Override + protected boolean preserveDataStreamsUponCompletion() { + return true; + } + public MultiClusterSearchWithSecurityYamlTestSuiteIT( @Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); diff --git a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/100_resolve_index.yml b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/100_resolve_index.yml index 0bfc91fe861..3d9dfefc11d 100644 --- a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/100_resolve_index.yml +++ b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/100_resolve_index.yml @@ -1,8 +1,8 @@ --- "Resolve index with indices, aliases, and data streams": - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/62210" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.resolve_index: