Skip to content

Commit b1a861e

Browse files
jozalajozala
authored
Fix lucene compat tests by keeping asserts disabled (#136094)
These asserts have been enabled for the lucene compat because `oldVersion` is now correctly set after #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
1 parent ec9b8d7 commit b1a861e

File tree

3 files changed

+2
-74
lines changed

3 files changed

+2
-74
lines changed

‎muted-tests.yml‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -615,81 +615,9 @@ tests:
615615
- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
616616
method: testGetAdditionalIndexSettingsMappingsMerging
617617
issue: https://github.com/elastic/elasticsearch/issues/135884
618-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
619-
method: testRollupIndex {cluster=UPGRADED}
620-
issue: https://github.com/elastic/elasticsearch/issues/135906
621-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
622-
method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
623-
issue: https://github.com/elastic/elasticsearch/issues/135907
624-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
625-
method: testSingleDoc {cluster=UPGRADED}
626-
issue: https://github.com/elastic/elasticsearch/issues/135908
627-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
628-
method: testResize {cluster=UPGRADED}
629-
issue: https://github.com/elastic/elasticsearch/issues/135909
630-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
631-
method: testSystemIndexMetadataIsUpgraded {cluster=UPGRADED}
632-
issue: https://github.com/elastic/elasticsearch/issues/135923
633-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
634-
method: testSearch {cluster=UPGRADED}
635-
issue: https://github.com/elastic/elasticsearch/issues/135927
636-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
637-
method: testPeerRecoveryRetentionLeases {cluster=UPGRADED}
638-
issue: https://github.com/elastic/elasticsearch/issues/135929
639-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
640-
method: testPersianAnalyzerBWC {cluster=UPGRADED}
641-
issue: https://github.com/elastic/elasticsearch/issues/135930
642-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
643-
method: testSnapshotRestore {cluster=UPGRADED}
644-
issue: https://github.com/elastic/elasticsearch/issues/135933
645-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
646-
method: testForbidDisableSoftDeletesOnRestore {cluster=UPGRADED}
647-
issue: https://github.com/elastic/elasticsearch/issues/135937
648-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
649-
method: testShrinkAfterUpgrade {cluster=UPGRADED}
650-
issue: https://github.com/elastic/elasticsearch/issues/135938
651618
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
652619
method: testTopNPushedToLuceneOnSortedIndex
653620
issue: https://github.com/elastic/elasticsearch/issues/135939
654-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
655-
method: testClosedIndices {cluster=UPGRADED}
656-
issue: https://github.com/elastic/elasticsearch/issues/135941
657-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
658-
method: testOperationBasedRecovery {cluster=UPGRADED}
659-
issue: https://github.com/elastic/elasticsearch/issues/135944
660-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
661-
method: testRomanianAnalyzerBWC {cluster=UPGRADED}
662-
issue: https://github.com/elastic/elasticsearch/issues/135948
663-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
664-
method: testEmptyShard {cluster=UPGRADED}
665-
issue: https://github.com/elastic/elasticsearch/issues/135951
666-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
667-
method: testRollover {cluster=UPGRADED}
668-
issue: https://github.com/elastic/elasticsearch/issues/135952
669-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
670-
method: testRecovery {cluster=UPGRADED}
671-
issue: https://github.com/elastic/elasticsearch/issues/135953
672-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
673-
method: testNewReplicas {cluster=UPGRADED}
674-
issue: https://github.com/elastic/elasticsearch/issues/135956
675-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
676-
method: testHistoryUUIDIsAdded {cluster=UPGRADED}
677-
issue: https://github.com/elastic/elasticsearch/issues/135957
678-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
679-
method: testTurnOffTranslogRetentionAfterUpgraded {cluster=UPGRADED}
680-
issue: https://github.com/elastic/elasticsearch/issues/135958
681-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
682-
method: testSoftDeletes {cluster=UPGRADED}
683-
issue: https://github.com/elastic/elasticsearch/issues/135959
684-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
685-
method: testClusterState {cluster=UPGRADED}
686-
issue: https://github.com/elastic/elasticsearch/issues/135960
687-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
688-
method: testShrink {cluster=UPGRADED}
689-
issue: https://github.com/elastic/elasticsearch/issues/135962
690-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
691-
method: testSearchTimeSeriesMode {cluster=UPGRADED}
692-
issue: https://github.com/elastic/elasticsearch/issues/135963
693621
- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
694622
method: testGetAdditionalIndexSettings
695623
issue: https://github.com/elastic/elasticsearch/issues/135972

‎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)