honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make qa/full-cluster-restart tests pass. By fixing a helper method and (#38604) 

muting a test.

Relates to #38603
This commit is contained in:
Martijn van Groningen 2019-02-08 14:14:23 +01:00 committed by GitHub
parent 779673c792
commit b284fede0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
View File

@ -843,6 +843,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
* old and new versions. All of the snapshots include an index, a template, * old and new versions. All of the snapshots include an index, a template,
* and some routing configuration. * and some routing configuration.
*/ */
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38603")
public void testSnapshotRestore() throws IOException { public void testSnapshotRestore() throws IOException {
int count; int count;
if (isRunningAgainstOldCluster() && getOldClusterVersion().major < 8) { if (isRunningAgainstOldCluster() && getOldClusterVersion().major < 8) {
@ -1214,7 +1215,7 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
private String loadInfoDocument(String type) throws IOException { private String loadInfoDocument(String type) throws IOException {
Request request = new Request("GET", "/info/" + this.type + "/" + index + "_" + type); Request request = new Request("GET", "/info/" + this.type + "/" + index + "_" + type);
request.addParameter("filter_path", "_source"); request.addParameter("filter_path", "_source");
if (isRunningAgainstAncientCluster()) { if (getOldClusterVersion().before(Version.V_6_7_0)) {
request.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE)); request.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE));
} }
String doc = toStr(client().performRequest(request)); String doc = toStr(client().performRequest(request));