Skip to content

Re-enable and fix the EsqlRestValidationIT test #128542

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 6 commits into from
May 28, 2025
Merged

Re-enable and fix the EsqlRestValidationIT test #128542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09f1c10
Re-enable and fix the EsqlRestValidationIT test
smalyshev May 28, 2025
a1b54cb
cleanup
smalyshev May 28, 2025
e06b636
Merge branch 'main' into fix-validation-test
smalyshev May 28, 2025
4b1badd
unmute
smalyshev May 28, 2025
1bf691a
Inline method
smalyshev May 28, 2025
ee7eb41
Enable this one too
smalyshev May 28, 2025
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
2 changes: 0 additions & 2 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ tests:
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
method: testSearchWhileRelocating
issue: https://github.com/elastic/elasticsearch/issues/128500
- class: org.elasticsearch.xpack.esql.ccq.EsqlRestValidationIT
issue: https://github.com/elastic/elasticsearch/issues/128543
- class: org.elasticsearch.xpack.ccr.index.engine.FollowingEngineTests
method: testProcessOnceOnPrimary
issue: https://github.com/elastic/elasticsearch/issues/128541
Expand Down
23 changes: 22 additions & 1 deletion ...clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/EsqlRestValidationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,29 @@ private RestClient remoteClusterClient() throws IOException {
return remoteClient;
}

protected boolean isSkipUnavailable() {
return true;
}

@Override
public void testAlias() throws IOException {
assumeFalse("expecting skip_unavailable to be false", isSkipUnavailable());
super.testAlias();
}

@Override
public void testExistentIndexWithoutWildcard() throws IOException {
assumeFalse("expecting skip_unavailable to be false", isSkipUnavailable());
super.testExistentIndexWithoutWildcard();
}

@Before
public void skipTestOnOldVersions() {
assumeTrue("skip on old versions", Clusters.localClusterVersion().equals(Version.V_8_19_0));
Version version = Clusters.localClusterVersion();
assumeTrue(
"skip on old versions",
version.onOrAfter(Version.fromString("9.1.0"))
|| (version.onOrAfter(Version.fromString("8.19.0")) && version.before(Version.fromString("9.0.0")))
);
}
}
5 changes: 5 additions & 0 deletions ...c/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/EsqlRestValidationSkipUnFalseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ public class EsqlRestValidationSkipUnFalseIT extends EsqlRestValidationIT {
protected String getTestRestCluster() {
return localCluster.getHttpAddresses();
}

@Override
protected boolean isSkipUnavailable() {
return false;
}
}
5 changes: 2 additions & 3 deletions ...sters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/RequestIndexFilteringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,8 @@ protected void assertQueryResult(Map<String, Object> result, Matcher<?> columnMa
}

private static boolean checkVersion(org.elasticsearch.Version version) {
return version.onOrAfter(Version.fromString("9.1.0"));
// TODO: enable this when ported to 8.x
// || (version.onOrAfter(Version.fromString("8.19.0")) && version.before(Version.fromString("9.0.0")));
return version.onOrAfter(Version.fromString("9.1.0"))
|| (version.onOrAfter(Version.fromString("8.19.0")) && version.before(Version.fromString("9.0.0")));
}

// We need a separate test since remote missing indices and local missing indices now work differently
Expand Down