Skip to content

Skip shard deprecation messages in REST tests #30630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 16, 2018
Merged

Skip shard deprecation messages in REST tests #30630

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cddfd48
Skip shard deprecation messages in REST tests
jasontedor May 15, 2018
8bb1c14
Adjust comment
jasontedor May 15, 2018
7edb814
Adjust conditional
jasontedor May 15, 2018
94ebb8a
Fix precommit
jasontedor May 15, 2018
8ac224b
Suppress IntelliJ
jasontedor May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.elasticsearch.test.rest.yaml.section;

import org.apache.logging.log4j.Logger;
import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.Tuple;
Expand Down Expand Up @@ -233,7 +234,7 @@ public void execute(ClientYamlTestExecutionContext executionContext) throws IOEx
}
fail(formatStatusCodeMessage(response, catchStatusCode));
}
checkWarningHeaders(response.getWarningHeaders());
checkWarningHeaders(response.getWarningHeaders(), executionContext.masterVersion());
} catch(ClientYamlTestResponseException e) {
ClientYamlTestResponse restTestResponse = e.getRestTestResponse();
if (!Strings.hasLength(catchParam)) {
Expand All @@ -259,7 +260,7 @@ public void execute(ClientYamlTestExecutionContext executionContext) throws IOEx
/**
* Check that the response contains only the warning headers that we expect.
*/
void checkWarningHeaders(final List<String> warningHeaders) {
void checkWarningHeaders(final List<String> warningHeaders, final Version masterVersion) {
final List<String> unexpected = new ArrayList<>();
final List<String> unmatched = new ArrayList<>();
final List<String> missing = new ArrayList<>();
Expand All @@ -271,8 +272,19 @@ void checkWarningHeaders(final List<String> warningHeaders) {
final boolean matches = matcher.matches();
if (matches) {
final String message = matcher.group(1);
if (expected.remove(message) == false) {
unexpected.add(header);
// noinspection StatementWithEmptyBody
if (masterVersion.before(Version.V_7_0_0_alpha1)
&& message.equals("the default number of shards will change from [5] to [1] in 7.0.0; "
+ "if you wish to continue using the default of [5] shards, "
+ "you must manage this on the create index request or with an index template")) {
/*
* This warning header will come back in the vast majority of our tests that create an index when running against an
* older master. Rather than rewrite our tests to assert this warning header, we assume that it is expected.
*/
} else {
if (expected.remove(message) == false) {
unexpected.add(header);
}
}
} else {
unmatched.add(header);
Expand Down