From a427a283188204925cc0a3f1db7d4b5e2b6f8352 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 27 Feb 2019 09:20:41 +0100 Subject: [PATCH] Unmuted testCannotFollowLeaderInUpgradedCluster test. Relates to #39355 --- .../java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java b/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java index 3af391c4cf8..68e1ffb108b 100644 --- a/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java +++ b/x-pack/qa/rolling-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java @@ -207,7 +207,6 @@ 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); @@ -224,7 +223,8 @@ public class CcrRollingUpgradeIT extends AbstractMultiClusterUpgradeTestCase { assertThat(e.getMessage(), containsString("] which is higher than the version of this node [")); } else if (clusterName == ClusterName.LEADER) { // At this point all nodes in both clusters have been updated and - // the leader cluster can now follow leader_index4 in the follower cluster: + // the leader cluster can now follow not_supported index in the follower cluster: + ensureGreen(followerClient(), "not_supported"); followIndex(leaderClient(), "follower", "not_supported", "not_supported"); assertTotalHitCount("not_supported", 64, leaderClient()); } else {