From 95ff6b207133f81afc8985ad0530974a61762ce8 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 3 Jul 2025 10:07:46 +0200 Subject: [PATCH 1/2] Unmute 52_esql_insist_operator_synthetic_source.yml and ensure this yaml test suite isn't run if build is not snapshot. Closes #130506 Closes #130507 --- muted-tests.yml | 6 ------ .../xpack/logsdb/LogsdbTestSuiteIT.java | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 53cc7c44768c7..e49f3e92b9bbc 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -596,12 +596,6 @@ tests: - class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT method: testTopNPushedToLucene issue: https://github.com/elastic/elasticsearch/issues/130505 -- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT - method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_πŸ”and LIMIT 1} - issue: https://github.com/elastic/elasticsearch/issues/130506 -- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT - method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_πŸ”} - issue: https://github.com/elastic/elasticsearch/issues/130507 - class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests method: testGetSystemTrustStoreWithNoSystemProperties issue: https://github.com/elastic/elasticsearch/issues/130517 diff --git a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java index 9275c7936faff..f515afe83332c 100644 --- a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java +++ b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java @@ -10,6 +10,7 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.Build; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; @@ -20,6 +21,9 @@ import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; import org.junit.ClassRule; +import java.util.ArrayList; +import java.util.List; + public class LogsdbTestSuiteIT extends ESClientYamlSuiteTestCase { private static final String USER = "test_admin"; @@ -43,7 +47,19 @@ public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + // Filter out 52_esql_insist_operator_synthetic_source.yml suite is build is not snapshot: + // (esql doesn't use feature flags and all experimental features are just enabled if build is snapshot) + + List filtered = new ArrayList<>(); + for (Object[] params : ESClientYamlSuiteTestCase.createParameters()) { + ClientYamlTestCandidate candidate = (ClientYamlTestCandidate) params[0]; + if (candidate.getRestTestSuite().getName().equals("52_esql_insist_operator_synthetic_source") + && Build.current().isSnapshot() == false) { + continue; + } + filtered.add(new Object[] { candidate }); + } + return filtered; } @Override From 79a93f6f51ab20e95cc1ed5c88b7d9bb6fd4ec2a Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 3 Jul 2025 11:07:25 +0200 Subject: [PATCH 2/2] iter Co-authored-by: Kostas Krikellas <131142368+kkrik-es@users.noreply.github.com> --- .../java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java index f515afe83332c..72ba813055083 100644 --- a/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java +++ b/x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java @@ -47,7 +47,7 @@ public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { @ParametersFactory public static Iterable parameters() throws Exception { - // Filter out 52_esql_insist_operator_synthetic_source.yml suite is build is not snapshot: + // Filter out 52_esql_insist_operator_synthetic_source.yml suite for snapshot builds: // (esql doesn't use feature flags and all experimental features are just enabled if build is snapshot) List filtered = new ArrayList<>();