From b284fede0b31cfcc3f4ce5fcd499be307b584e68 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 8 Feb 2019 14:14:23 +0100 Subject: [PATCH] Make qa/full-cluster-restart tests pass. By fixing a helper method and (#38604) muting a test. Relates to #38603 --- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index c97bd808e27..73846871b00 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -843,6 +843,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase { * old and new versions. All of the snapshots include an index, a template, * and some routing configuration. */ + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38603") public void testSnapshotRestore() throws IOException { int count; if (isRunningAgainstOldCluster() && getOldClusterVersion().major < 8) { @@ -1214,7 +1215,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase { private String loadInfoDocument(String type) throws IOException { Request request = new Request("GET", "/info/" + this.type + "/" + index + "_" + type); request.addParameter("filter_path", "_source"); - if (isRunningAgainstAncientCluster()) { + if (getOldClusterVersion().before(Version.V_6_7_0)) { request.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE)); } String doc = toStr(client().performRequest(request));