Skip to content

Commit 7a32762

Browse files
dnhatngeorgewallace
authored andcommitted
Remove skip with semantic_text tests in ES|QL (elastic#123948)
This change removes the skipping introduced for the semantic_text tests in elastic#122222. These tests were accidentally re-enabled without failures over the last two weeks, so we can now re-enable them. Closes elastic#121411 Relates elastic#122222
1 parent b2a48a6 commit 7a32762

File tree

4 files changed

+0
-27
lines changed

4 files changed

+0
-27
lines changed

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ protected void shouldSkipTest(String testName) throws IOException {
7070
assumeTrue("Test " + testName + " is skipped on " + bwcVersion, isEnabled(testName, instructions, bwcVersion));
7171
}
7272

73-
@Override
74-
protected boolean shouldSkipTestsWithSemanticTextFields() {
75-
return true;
76-
}
77-
7873
@Override
7974
protected boolean enableRoundingDoubleValuesOnAsserting() {
8075
return true;

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@ protected void shouldSkipTest(String testName) throws IOException {
132132
assumeFalse("UNMAPPED FIELDS not yet supported in CCS", testCase.requiredCapabilities.contains(UNMAPPED_FIELDS.capabilityName()));
133133
}
134134

135-
@Override
136-
protected boolean shouldSkipTestsWithSemanticTextFields() {
137-
return true;
138-
}
139-
140135
private TestFeatureService remoteFeaturesService() throws IOException {
141136
if (remoteFeaturesService == null) {
142137
var remoteNodeVersions = readVersionsFromNodesInfo(remoteClusterClient());

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ protected boolean enableRoundingDoubleValuesOnAsserting() {
4343
return cluster.getNumNodes() > 1;
4444
}
4545

46-
@Override
47-
protected boolean shouldSkipTestsWithSemanticTextFields() {
48-
return cluster.getNumNodes() > 1;
49-
}
50-
5146
@Override
5247
protected boolean supportsSourceFieldMapping() {
5348
return cluster.getNumNodes() == 1;

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.deleteInferenceEndpoint;
7171
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.loadDataSetIntoEs;
7272
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
73-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SEMANTIC_TEXT_TYPE;
7473
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SOURCE_FIELD_MAPPING;
7574

7675
// This test can run very long in serverless configurations
@@ -130,9 +129,6 @@ protected EsqlSpecTestCase(
130129

131130
@Before
132131
public void setup() throws IOException {
133-
if (shouldSkipTestsWithSemanticTextFields()) {
134-
assumeFalse("semantic_text tests are muted", testCase.requiredCapabilities.contains(SEMANTIC_TEXT_TYPE.capabilityName()));
135-
}
136132
if (supportsInferenceTestService() && clusterHasInferenceEndpoint(client()) == false) {
137133
createInferenceEndpoint(client());
138134
}
@@ -144,11 +140,6 @@ public void setup() throws IOException {
144140
}
145141
}
146142

147-
// https://github.com/elastic/elasticsearch/issues/121411
148-
protected boolean shouldSkipTestsWithSemanticTextFields() {
149-
return false;
150-
}
151-
152143
@AfterClass
153144
public static void wipeTestData() throws IOException {
154145
try {
@@ -184,9 +175,6 @@ protected void shouldSkipTest(String testName) throws IOException {
184175
}
185176
checkCapabilities(adminClient(), testFeatureService, testName, testCase);
186177
assumeTrue("Test " + testName + " is not enabled", isEnabled(testName, instructions, Version.CURRENT));
187-
if (shouldSkipTestsWithSemanticTextFields()) {
188-
assumeFalse("semantic_text tests are muted", testCase.requiredCapabilities.contains(SEMANTIC_TEXT_TYPE.capabilityName()));
189-
}
190178
if (supportsSourceFieldMapping() == false) {
191179
assumeFalse("source mapping tests are muted", testCase.requiredCapabilities.contains(SOURCE_FIELD_MAPPING.capabilityName()));
192180
}

0 commit comments

Comments
 (0)