Skip to content

Commit 91b4b1e

Browse files
authored
char_filter pattern_replace error requires at least java 21 (#116507)
This test requires at least java 21, skip it otherwise. closes: #116405 closes: #116134
1 parent f14c8bd commit 91b4b1e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

modules/analysis-common/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* your election, the "Elastic License 2.0", the "GNU Affero General Public
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
9-
import org.elasticsearch.gradle.Version
9+
import org.elasticsearch.gradle.internal.info.BuildParams
1010

1111
apply plugin: 'elasticsearch.internal-yaml-rest-test'
1212
apply plugin: 'elasticsearch.yaml-rest-compat-test'
@@ -30,6 +30,15 @@ dependencies {
3030
clusterModules project(':modules:mapper-extras')
3131
}
3232

33+
tasks.named("yamlRestTest").configure { task->
34+
if (BuildParams.getRuntimeJavaVersion().majorVersion.toInteger() < 21) {
35+
// Requires at least Java 21
36+
systemProperty 'tests.rest.blacklist', [
37+
"analysis-common/50_char_filters/pattern_replace error handling (too complex pattern)"
38+
].join(',')
39+
}
40+
}
41+
3342
tasks.named("yamlRestTestV7CompatTransform").configure { task ->
3443
task.skipTest("indices.analyze/10_analyze/htmlStrip_deprecated", "Cleanup versioned deprecations in analysis #41560")
3544
task.skipTest("analysis-common/40_token_filters/delimited_payload_filter_error", "Remove preconfigured delimited_payload_filter #43686")

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,6 @@ tests:
254254
- class: org.elasticsearch.upgrades.FullClusterRestartIT
255255
method: testSnapshotRestore {cluster=OLD}
256256
issue: https://github.com/elastic/elasticsearch/issues/111777
257-
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
258-
method: test {yaml=analysis-common/50_char_filters/pattern_replace error handling (too complex pattern)}
259-
issue: https://github.com/elastic/elasticsearch/issues/116134
260257
- class: org.elasticsearch.xpack.ml.integration.DatafeedJobsRestIT
261258
method: testLookbackWithIndicesOptions
262259
issue: https://github.com/elastic/elasticsearch/issues/116127

0 commit comments

Comments
 (0)