Always enable soft-deletes in CcrRollingUpgradeIT (#76797)

* Remove AwaitsFix CcrRollingUpgradeIT (#76765) Fixed in #60054 * Always enable soft-deletes in CcrRollingUpgradeIT (#76786)
elastic · Aug 21, 2021 · 5412228 · 5412228
1 parent 6ecb8e4
commit 5412228
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/...g-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java b/...g-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java
@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.upgrades;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestClient;
@@ -23,13 +22,7 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class CcrRollingUpgradeIT extends AbstractMultiClusterUpgradeTestCase {
-
-    // TODO: Remove this empty test
-    public void testEmpty() {
-
-    }
-
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/59625")
+
     public void testUniDirectionalIndexFollowing() throws Exception {
         logger.info("clusterName={}, upgradeState={}", clusterName, upgradeState);
 
@@ -305,10 +298,8 @@ public void testBiDirectionalIndexFollowing() throws Exception {
     private static void createLeaderIndex(RestClient client, String indexName) throws IOException {
         Settings.Builder indexSettings = Settings.builder()
             .put("index.number_of_shards", 1)
-            .put("index.number_of_replicas", 0);
-        if (UPGRADE_FROM_VERSION.before(Version.V_7_0_0) || randomBoolean()) {
-            indexSettings.put("index.soft_deletes.enabled", true);
-        }
+            .put("index.number_of_replicas", 0)
+            .put("index.soft_deletes.enabled", true);
         createIndex(client, indexName, indexSettings.build());
     }