Skip to content

[9.2] Skip spec tests when test cluster broken (#135862) #135986

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 1 commit into from
Oct 4, 2025
Merged

[9.2] Skip spec tests when test cluster broken (#135862) #135986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...le-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ protected boolean supportsSourceFieldMapping() {

@Before
public void configureChunks() throws IOException {
assumeTrue("test clusters were broken", testClustersOk);
boolean smallChunks = randomBoolean();
Request request = new Request("PUT", "/_cluster/settings");
XContentBuilder builder = JsonXContent.contentBuilder().startObject().startObject("persistent");
Expand Down
23 changes: 22 additions & 1 deletion ...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,11 @@ protected EsqlSpecTestCase(
}

private static boolean dataLoaded = false;
protected static boolean testClustersOk = true;

@Before
public void setup() throws IOException {
assumeTrue("test clusters were broken", testClustersOk);
boolean supportsLookup = supportsIndexModeLookup();
boolean supportsSourceMapping = supportsSourceFieldMapping();
boolean supportsInferenceTestService = supportsInferenceTestService();
Expand All @@ -140,6 +142,9 @@ public void setup() throws IOException {

@AfterClass
public static void wipeTestData() throws IOException {
if (testClustersOk == false) {
return;
}
try {
dataLoaded = false;
adminClient().performRequest(new Request("DELETE", "/*"));
Expand All @@ -162,11 +167,25 @@ public final void test() throws Throwable {
shouldSkipTest(testName);
doTest();
} catch (Exception e) {
ensureTestClustersAreOk(e);
throw reworkException(e);
}
}

protected void ensureTestClustersAreOk(Exception failure) {
try {
ensureHealth(client(), "", (request) -> {
request.addParameter("wait_for_status", "yellow");
request.addParameter("level", "shards");
});
} catch (Exception inner) {
testClustersOk = false;
failure.addSuppressed(inner);
}
}

protected void shouldSkipTest(String testName) throws IOException {
assumeTrue("test clusters were broken", testClustersOk);
if (requiresInferenceEndpoint()) {
assumeTrue("Inference test service needs to be supported", supportsInferenceTestService());
}
Expand Down Expand Up @@ -374,7 +393,9 @@ protected boolean preserveClusterUponCompletion() {

@After
public void assertRequestBreakerEmptyAfterTests() throws Exception {
assertRequestBreakerEmpty();
if (testClustersOk) {
assertRequestBreakerEmpty();
}
}

public static void assertRequestBreakerEmpty() throws Exception {
Expand Down