From eeeaa2c0f4b6cc109c83a5753faac5ee8d82d522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= <aurelien.foucret@gmail.com>
Date: Wed, 20 Nov 2024 16:20:44 +0100
Subject: [PATCH] Disable KqlQueryBuilderTests on non-snapshots build.
 (#117025)

(cherry picked from commit 537bba6787ee43fc691e8bb2a586a51f46090bae)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/kql/build.gradle
---
 muted-tests.yml                                           | 2 --
 x-pack/plugin/kql/build.gradle                            | 8 --------
 .../xpack/kql/query/KqlQueryBuilderTests.java             | 6 ++++++
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index b33ddf787337d..69de871b858f1 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -311,8 +311,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT
   method: test {p0=esql/60_enrich/Enrich on keyword with fields}
   issue: https://github.com/elastic/elasticsearch/issues/116593
-- class: org.elasticsearch.xpack.kql.query.KqlQueryBuilderTests
-  issue: https://github.com/elastic/elasticsearch/issues/116487
 - class: org.elasticsearch.xpack.spatial.search.GeoGridAggAndQueryConsistencyIT
   method: testGeoShapeGeoTile
   issue: https://github.com/elastic/elasticsearch/issues/115717
diff --git a/x-pack/plugin/kql/build.gradle b/x-pack/plugin/kql/build.gradle
index 7e4df5654f225..f493a52cde19d 100644
--- a/x-pack/plugin/kql/build.gradle
+++ b/x-pack/plugin/kql/build.gradle
@@ -1,5 +1,3 @@
-import org.elasticsearch.gradle.internal.info.BuildParams
-
 import static org.elasticsearch.gradle.util.PlatformUtils.normalize
 
 apply plugin: 'elasticsearch.internal-es-plugin'
@@ -28,12 +26,6 @@ dependencies {
 
 tasks.named('yamlRestTest') {
   usesDefaultDistribution()
-}.configure {
-  /****************************************************************
-  *  Enable QA/rest integration tests for snapshot builds only   *
-  *  TODO: Enable for all builds upon this feature release       *
-    ****************************************************************/
-  enabled = BuildParams.isSnapshotBuild()
 }
 
 /**********************************
diff --git a/x-pack/plugin/kql/src/test/java/org/elasticsearch/xpack/kql/query/KqlQueryBuilderTests.java b/x-pack/plugin/kql/src/test/java/org/elasticsearch/xpack/kql/query/KqlQueryBuilderTests.java
index 2bc23c7d457dd..7323f7d6d1a4e 100644
--- a/x-pack/plugin/kql/src/test/java/org/elasticsearch/xpack/kql/query/KqlQueryBuilderTests.java
+++ b/x-pack/plugin/kql/src/test/java/org/elasticsearch/xpack/kql/query/KqlQueryBuilderTests.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.kql.query;
 
 import org.apache.lucene.search.Query;
+import org.elasticsearch.Build;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -21,6 +22,7 @@
 import org.elasticsearch.test.AbstractQueryTestCase;
 import org.elasticsearch.xpack.kql.KqlPlugin;
 import org.hamcrest.Matchers;
+import org.junit.BeforeClass;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -34,6 +36,10 @@
 import static org.hamcrest.Matchers.nullValue;
 
 public class KqlQueryBuilderTests extends AbstractQueryTestCase<KqlQueryBuilder> {
+    @BeforeClass
+    protected static void ensureSnapshotBuild() {
+        assumeTrue("requires snapshot builds", Build.current().isSnapshot());
+    }
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {