Browse Source

Unmute test

This test can't run when do a rolling upgrade against current version.

Closes #39355
Martijn van Groningen 6 years ago
parent
commit
2e2c0576d1

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

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.upgrades;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestClient;
@@ -206,9 +207,14 @@ public class CcrRollingUpgradeIT extends AbstractMultiClusterUpgradeTestCase {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39355")
     public void testCannotFollowLeaderInUpgradedCluster() throws Exception {
-        assumeTrue("Tests only runs with upgrade_state [all]", upgradeState == UpgradeState.ALL);
+        if (upgradeState != UpgradeState.ALL) {
+            return;
+        }
+        if (Version.CURRENT.equals(UPGRADE_FROM_VERSION)) {
+            // can't run this test when executing rolling upgrade against current version.
+            return;
+        }
 
         if (clusterName == ClusterName.FOLLOWER) {
             // At this point the leader cluster has not been upgraded, but follower cluster has been upgrade.