From 9e49af03b77ba7a840be22afed99462b04abeae3 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Wed, 1 Jul 2020 11:50:30 +1000 Subject: [PATCH] Reenable test after backport (#58717) This commit re-enables CCR rolling upgrade tests following the backport of #58217 to 7.8 branch (7.8.1) --- .../org/elasticsearch/upgrades/CcrRollingUpgradeIT.java | 6 ------ 1 file changed, 6 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 172f0474ed7..3c8fff8a9b3 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 @@ -13,7 +13,6 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ObjectPath; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.junit.Before; import java.io.IOException; import java.util.Map; @@ -24,11 +23,6 @@ import static org.hamcrest.Matchers.equalTo; public class CcrRollingUpgradeIT extends AbstractMultiClusterUpgradeTestCase { - @Before - public void skipForBackportOf58217() { - assumeFalse("Skip while back-porting #58217", UPGRADE_FROM_VERSION.equals(Version.V_7_8_1)); - } - public void testUniDirectionalIndexFollowing() throws Exception { logger.info("clusterName={}, upgradeState={}", clusterName, upgradeState);