Skip to content

Commit 2e2c057

Browse files
committed
Unmute test
This test can't run when do a rolling upgrade against current version. Closes #39355
1 parent bae7e71 commit 2e2c057

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package org.elasticsearch.upgrades;
77

8+
import org.elasticsearch.Version;
89
import org.elasticsearch.client.Request;
910
import org.elasticsearch.client.ResponseException;
1011
import org.elasticsearch.client.RestClient;
@@ -206,9 +207,14 @@ public void testAutoFollowing() throws Exception {
206207
}
207208
}
208209

209-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39355")
210210
public void testCannotFollowLeaderInUpgradedCluster() throws Exception {
211-
assumeTrue("Tests only runs with upgrade_state [all]", upgradeState == UpgradeState.ALL);
211+
if (upgradeState != UpgradeState.ALL) {
212+
return;
213+
}
214+
if (Version.CURRENT.equals(UPGRADE_FROM_VERSION)) {
215+
// can't run this test when executing rolling upgrade against current version.
216+
return;
217+
}
212218

213219
if (clusterName == ClusterName.FOLLOWER) {
214220
// At this point the leader cluster has not been upgraded, but follower cluster has been upgrade.

0 commit comments

Comments
 (0)