Skip to content

Commit 9fd8bf1

Browse files
martijnvgkkrik-es
andauthored
Unmute 52_esql_insist_operator_synthetic_source.yml (#130528)
and ensure this yaml test suite isn't run if build is not snapshot. Closes #130506 Closes #130507 Co-authored-by: Kostas Krikellas <131142368+kkrik-es@users.noreply.github.com>
1 parent bc02964 commit 9fd8bf1

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

muted-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -584,12 +584,6 @@ tests:
584584
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
585585
method: testTopNPushedToLucene
586586
issue: https://github.com/elastic/elasticsearch/issues/130505
587-
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
588-
method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_🐔and LIMIT 1}
589-
issue: https://github.com/elastic/elasticsearch/issues/130506
590-
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
591-
method: test {yaml=/52_esql_insist_operator_synthetic_source/FROM with INSIST_🐔}
592-
issue: https://github.com/elastic/elasticsearch/issues/130507
593587
- class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
594588
method: testGetSystemTrustStoreWithNoSystemProperties
595589
issue: https://github.com/elastic/elasticsearch/issues/130517

x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.carrotsearch.randomizedtesting.annotations.Name;
1111
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
1212

13+
import org.elasticsearch.Build;
1314
import org.elasticsearch.common.settings.SecureString;
1415
import org.elasticsearch.common.settings.Settings;
1516
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -20,6 +21,9 @@
2021
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
2122
import org.junit.ClassRule;
2223

24+
import java.util.ArrayList;
25+
import java.util.List;
26+
2327
public class LogsdbTestSuiteIT extends ESClientYamlSuiteTestCase {
2428

2529
private static final String USER = "test_admin";
@@ -43,7 +47,19 @@ public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
4347

4448
@ParametersFactory
4549
public static Iterable<Object[]> parameters() throws Exception {
46-
return ESClientYamlSuiteTestCase.createParameters();
50+
// Filter out 52_esql_insist_operator_synthetic_source.yml suite for snapshot builds:
51+
// (esql doesn't use feature flags and all experimental features are just enabled if build is snapshot)
52+
53+
List<Object[]> filtered = new ArrayList<>();
54+
for (Object[] params : ESClientYamlSuiteTestCase.createParameters()) {
55+
ClientYamlTestCandidate candidate = (ClientYamlTestCandidate) params[0];
56+
if (candidate.getRestTestSuite().getName().equals("52_esql_insist_operator_synthetic_source")
57+
&& Build.current().isSnapshot() == false) {
58+
continue;
59+
}
60+
filtered.add(new Object[] { candidate });
61+
}
62+
return filtered;
4763
}
4864

4965
@Override

0 commit comments

Comments
 (0)