Skip to content

Commit 537bba6

Browse files
authored
Disable KqlQueryBuilderTests on non-snapshots build. (elastic#117025)
1 parent d5bc389 commit 537bba6

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

muted-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ tests:
180180
- class: org.elasticsearch.xpack.downsample.ILMDownsampleDisruptionIT
181181
method: testILMDownsampleRollingRestart
182182
issue: https://github.com/elastic/elasticsearch/issues/114233
183-
- class: org.elasticsearch.xpack.kql.query.KqlQueryBuilderTests
184-
issue: https://github.com/elastic/elasticsearch/issues/116487
185183
- class: org.elasticsearch.reservedstate.service.FileSettingsServiceTests
186184
method: testInvalidJSON
187185
issue: https://github.com/elastic/elasticsearch/issues/116521

x-pack/plugin/kql/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.elasticsearch.gradle.internal.info.BuildParams
2-
31
import static org.elasticsearch.gradle.util.PlatformUtils.normalize
42

53
apply plugin: 'elasticsearch.internal-es-plugin'
@@ -28,12 +26,6 @@ dependencies {
2826

2927
tasks.named('yamlRestTest').configure {
3028
usesDefaultDistribution()
31-
32-
/****************************************************************
33-
* Enable QA/rest integration tests for snapshot builds only *
34-
* TODO: Enable for all builds upon this feature release *
35-
****************************************************************/
36-
enabled = buildParams.isSnapshotBuild()
3729
}
3830

3931
/**********************************

x-pack/plugin/kql/src/test/java/org/elasticsearch/xpack/kql/query/KqlQueryBuilderTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package org.elasticsearch.xpack.kql.query;
99

1010
import org.apache.lucene.search.Query;
11+
import org.elasticsearch.Build;
1112
import org.elasticsearch.core.Strings;
1213
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
1314
import org.elasticsearch.index.query.QueryBuilder;
@@ -21,6 +22,7 @@
2122
import org.elasticsearch.test.AbstractQueryTestCase;
2223
import org.elasticsearch.xpack.kql.KqlPlugin;
2324
import org.hamcrest.Matchers;
25+
import org.junit.BeforeClass;
2426

2527
import java.io.IOException;
2628
import java.util.Collection;
@@ -34,6 +36,10 @@
3436
import static org.hamcrest.Matchers.nullValue;
3537

3638
public class KqlQueryBuilderTests extends AbstractQueryTestCase<KqlQueryBuilder> {
39+
@BeforeClass
40+
protected static void ensureSnapshotBuild() {
41+
assumeTrue("requires snapshot builds", Build.current().isSnapshot());
42+
}
3743

3844
@Override
3945
protected Collection<Class<? extends Plugin>> getPlugins() {

0 commit comments

Comments
 (0)