Skip to content

Remove skip with semantic_text tests in ES|QL #123948

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
Mar 4, 2025
Merged

Remove skip with semantic_text tests in ES|QL #123948

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
5 changes: 0 additions & 5 deletions ...r/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ 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
5 changes: 0 additions & 5 deletions ...i-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,6 @@ protected void shouldSkipTest(String testName) throws IOException {
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
}

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

private TestFeatureService remoteFeaturesService() throws IOException {
if (remoteFeaturesService == null) {
var remoteNodeVersions = readVersionsFromNodesInfo(remoteClusterClient());
Expand Down
5 changes: 0 additions & 5 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 @@ -43,11 +43,6 @@ protected boolean enableRoundingDoubleValuesOnAsserting() {
return cluster.getNumNodes() > 1;
}

@Override
protected boolean shouldSkipTestsWithSemanticTextFields() {
return cluster.getNumNodes() > 1;
}

@Override
protected boolean supportsSourceFieldMapping() {
return cluster.getNumNodes() == 1;
Expand Down
12 changes: 0 additions & 12 deletions ...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 @@ -70,7 +70,6 @@
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;
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SOURCE_FIELD_MAPPING;

// This test can run very long in serverless configurations
Expand Down Expand Up @@ -130,9 +129,6 @@ 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());
}
Expand All @@ -144,11 +140,6 @@ public void setup() throws IOException {
}
}

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

@AfterClass
public static void wipeTestData() throws IOException {
try {
Expand Down Expand Up @@ -184,9 +175,6 @@ 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()));
}
if (supportsSourceFieldMapping() == false) {
assumeFalse("source mapping tests are muted", testCase.requiredCapabilities.contains(SOURCE_FIELD_MAPPING.capabilityName()));
}
Expand Down