Skip to content

Commit e89f70f

Browse files
committed
Fix lucene compat tests by keeping asserts disabled (elastic#136094)
These asserts have been enabled for the lucene compat because `oldVersion` is now correctly set after elastic#134584. Previously, in the Lucene compatibility tests, version was always set to `0.0.0` so the asserts were always disabled. Additionally, re-enable the tests that were muted because of the issue (cherry picked from commit b1a861e) # Conflicts: # muted-tests.yml
1 parent c750906 commit e89f70f

File tree

3 files changed

+2
-35
lines changed

3 files changed

+2
-35
lines changed

muted-tests.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -633,45 +633,12 @@ tests:
633633
- class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
634634
method: testMatchAllQuery
635635
issue: https://github.com/elastic/elasticsearch/issues/135820
636-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
637-
method: testRollupIndex {cluster=UPGRADED}
638-
issue: https://github.com/elastic/elasticsearch/issues/135906
639-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
640-
method: testSingleDoc {cluster=UPGRADED}
641-
issue: https://github.com/elastic/elasticsearch/issues/135908
642-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
643-
method: testRollover {cluster=UPGRADED}
644-
issue: https://github.com/elastic/elasticsearch/issues/135952
645636
- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
646637
method: testGetAdditionalIndexSettingsMappingsMerging
647638
issue: https://github.com/elastic/elasticsearch/issues/135884
648639
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
649640
method: testStopQueryInlineStats
650641
issue: https://github.com/elastic/elasticsearch/issues/135032
651-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
652-
method: testResize {cluster=UPGRADED}
653-
issue: https://github.com/elastic/elasticsearch/issues/135909
654-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
655-
method: testSearchTimeSeriesMode {cluster=UPGRADED}
656-
issue: https://github.com/elastic/elasticsearch/issues/135963
657-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
658-
method: testClusterState {cluster=UPGRADED}
659-
issue: https://github.com/elastic/elasticsearch/issues/135960
660-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
661-
method: testForbidDisableSoftDeletesOnRestore {cluster=UPGRADED}
662-
issue: https://github.com/elastic/elasticsearch/issues/135937
663-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
664-
method: testRomanianAnalyzerBWC {cluster=UPGRADED}
665-
issue: https://github.com/elastic/elasticsearch/issues/135948
666-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
667-
method: testRecovery {cluster=UPGRADED}
668-
issue: https://github.com/elastic/elasticsearch/issues/135953
669-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
670-
method: testHistoryUUIDIsAdded {cluster=UPGRADED}
671-
issue: https://github.com/elastic/elasticsearch/issues/135957
672-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
673-
method: testSnapshotRestore {cluster=UPGRADED}
674-
issue: https://github.com/elastic/elasticsearch/issues/135933
675642

676643
# Examples:
677644
#

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private static ElasticsearchCluster buildCluster() {
5757
.apply(() -> clusterConfig)
5858
.feature(FeatureFlag.TIME_SERIES_MODE);
5959

60-
if (oldVersion.before(Version.fromString("8.18.0"))) {
60+
if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
6161
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
6262
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
6363
}

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private static ElasticsearchCluster buildCluster() {
118118
.apply(() -> clusterConfig)
119119
.feature(FeatureFlag.TIME_SERIES_MODE);
120120

121-
if (oldVersion.before(Version.fromString("8.18.0"))) {
121+
if (oldVersion.before(Version.fromString("8.18.0")) || isOldClusterDetachedVersion()) {
122122
cluster.jvmArg("-da:org.elasticsearch.index.mapper.DocumentMapper");
123123
cluster.jvmArg("-da:org.elasticsearch.index.mapper.MapperService");
124124
}

0 commit comments

Comments
 (0)