Skip to content

Commit a803970

Browse files
authored
Fix lucene compat tests by keeping asserts disabled (elastic#136094) (elastic#136110)
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 b23f684 commit a803970

File tree

3 files changed

+2
-29
lines changed

3 files changed

+2
-29
lines changed

muted-tests.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -449,33 +449,6 @@ tests:
449449
- class: org.elasticsearch.aggregations.bucket.AggregationReductionCircuitBreakingIT
450450
method: testCBTrippingOnReduction
451451
issue: https://github.com/elastic/elasticsearch/issues/134902
452-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
453-
method: testEmptyShard {cluster=UPGRADED}
454-
issue: https://github.com/elastic/elasticsearch/issues/135951
455-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
456-
method: testSearch {cluster=UPGRADED}
457-
issue: https://github.com/elastic/elasticsearch/issues/135927
458-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
459-
method: testPersianAnalyzerBWC {cluster=UPGRADED}
460-
issue: https://github.com/elastic/elasticsearch/issues/135930
461-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
462-
method: testRollupIndex {cluster=UPGRADED}
463-
issue: https://github.com/elastic/elasticsearch/issues/135906
464-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
465-
method: testSystemIndexMetadataIsUpgraded {cluster=UPGRADED}
466-
issue: https://github.com/elastic/elasticsearch/issues/135923
467-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
468-
method: testNewReplicas {cluster=UPGRADED}
469-
issue: https://github.com/elastic/elasticsearch/issues/135956
470-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
471-
method: testPeerRecoveryRetentionLeases {cluster=UPGRADED}
472-
issue: https://github.com/elastic/elasticsearch/issues/135929
473-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
474-
method: testTurnOffTranslogRetentionAfterUpgraded {cluster=UPGRADED}
475-
issue: https://github.com/elastic/elasticsearch/issues/135958
476-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
477-
method: testOperationBasedRecovery {cluster=UPGRADED}
478-
issue: https://github.com/elastic/elasticsearch/issues/135944
479452

480453
# Examples:
481454
#

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)