Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 0 additions & 4 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,6 @@ tests:
- class: org.elasticsearch.search.CrossClusterSearchUnavailableClusterIT
method: testSearchSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121497
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
issue: https://github.com/elastic/elasticsearch/issues/121411
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
method: test {yaml=reference/cat/health/cat-health-no-timestamp-example}
issue: https://github.com/elastic/elasticsearch/issues/121867
Expand Down Expand Up @@ -388,8 +386,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/121680
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
issue: https://github.com/elastic/elasticsearch/issues/122153
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
issue: https://github.com/elastic/elasticsearch/issues/121411
- class: org.elasticsearch.xpack.esql.action.EsqlNodeFailureIT
method: testFailureLoadingFields
issue: https://github.com/elastic/elasticsearch/issues/122132
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ protected void shouldSkipTest(String testName) throws IOException {
assumeTrue("Test " + testName + " is skipped on " + bwcVersion, isEnabled(testName, instructions, bwcVersion));
}

@Override
protected boolean shouldSkipTestsWithSemanticTextFields() {
return true;
}

@Override
protected boolean enableRoundingDoubleValuesOnAsserting() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ protected void shouldSkipTest(String testName) throws IOException {
assumeFalse("LOOKUP JOIN not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName()));
}

@Override
protected boolean shouldSkipTestsWithSemanticTextFields() {
return true;
}

private TestFeatureService remoteFeaturesService() throws IOException {
if (remoteFeaturesService == null) {
var remoteNodeVersions = readVersionsFromNodesInfo(remoteClusterClient());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,9 @@ public EsqlSpecIT(
protected boolean enableRoundingDoubleValuesOnAsserting() {
return true;
}

@Override
protected boolean shouldSkipTestsWithSemanticTextFields() {
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,9 @@ protected boolean enableRoundingDoubleValuesOnAsserting() {
// This suite runs with more than one node and three shards in serverless
return cluster.getNumNodes() > 1;
}

@Override
protected boolean shouldSkipTestsWithSemanticTextFields() {
return cluster.getNumNodes() > 1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.deleteInferenceEndpoint;
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.loadDataSetIntoEs;
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SEMANTIC_TEXT_TYPE;

// This test can run very long in serverless configurations
@TimeoutSuite(millis = 30 * TimeUnits.MINUTE)
Expand Down Expand Up @@ -128,15 +129,22 @@ protected EsqlSpecTestCase(

@Before
public void setup() throws IOException {
if (shouldSkipTestsWithSemanticTextFields()) {
assumeFalse("semantic_text tests are muted", testCase.requiredCapabilities.contains(SEMANTIC_TEXT_TYPE.capabilityName()));
}
if (supportsInferenceTestService() && clusterHasInferenceEndpoint(client()) == false) {
createInferenceEndpoint(client());
}

if (indexExists(availableDatasetsForEs(client(), supportsIndexModeLookup()).iterator().next().indexName()) == false) {
loadDataSetIntoEs(client(), supportsIndexModeLookup());
}
}

// https://github.com/elastic/elasticsearch/issues/121411
protected boolean shouldSkipTestsWithSemanticTextFields() {
return false;
}

@AfterClass
public static void wipeTestData() throws IOException {
try {
Expand Down Expand Up @@ -172,6 +180,9 @@ protected void shouldSkipTest(String testName) throws IOException {
}
checkCapabilities(adminClient(), testFeatureService, testName, testCase);
assumeTrue("Test " + testName + " is not enabled", isEnabled(testName, instructions, Version.CURRENT));
if (shouldSkipTestsWithSemanticTextFields()) {
assumeFalse("semantic_text tests are muted", testCase.requiredCapabilities.contains(SEMANTIC_TEXT_TYPE.capabilityName()));
}
}

protected static void checkCapabilities(RestClient client, TestFeatureService testFeatureService, String testName, CsvTestCase testCase)
Expand Down