Skip to content

Commit 3d0819d

Browse files
committed
Ensure CSV tests are not run im multi_cluster environment
1 parent 1d6b589 commit 3d0819d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.deleteInferenceEndpoints;
7272
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.loadDataSetIntoEs;
7373
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
74+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.COMPLETION;
7475
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METRICS_COMMAND;
7576
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.RERANK;
7677
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.SEMANTIC_TEXT_FIELD_CAPS;
@@ -246,7 +247,7 @@ protected boolean supportsInferenceTestService() {
246247
}
247248

248249
protected boolean requiresInferenceEndpoint() {
249-
return Stream.of(SEMANTIC_TEXT_FIELD_CAPS.capabilityName(), RERANK.capabilityName())
250+
return Stream.of(SEMANTIC_TEXT_FIELD_CAPS.capabilityName(), RERANK.capabilityName(), COMPLETION.capabilityName())
250251
.anyMatch(testCase.requiredCapabilities::contains);
251252
}
252253

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,10 @@ public final void test() throws Throwable {
268268
"can't use rereank in csv tests",
269269
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.RERANK.capabilityName())
270270
);
271+
assumeFalse(
272+
"can't use completion in csv tests",
273+
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.COMPLETION.capabilityName())
274+
);
271275
assumeFalse(
272276
"can't use match in csv tests",
273277
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.capabilityName())

0 commit comments

Comments
 (0)