Fix failing unit tests.

Signed-off-by: Rishikesh1159 <[email protected]>
opensearch-project · Mar 22, 2023 · 7b3e333 · 7b3e333
1 parent 5065732
commit 7b3e333
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...ernalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationDefaultIT.java b/...ernalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationDefaultIT.java
@@ -31,7 +31,7 @@
 public class SegmentReplicationDefaultIT extends OpenSearchIntegTestCase {
 
     protected static final String INDEX_NAME = "test-idx-1";
-    protected static final String SYSTEM_INDEX_NAME = ".test-cluster-info-system-index";
+    protected static final String SYSTEM_INDEX_NAME = ".test-system-index";
     protected static final int SHARD_COUNT = 1;
     protected static final int REPLICA_COUNT = 1;
 

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
@@ -337,7 +337,7 @@ public void validate(final Boolean value, final Map<Setting<?>, Object> settings
                             + INDEX_REPLICATION_TYPE_SETTING.getKey()
                             + " should be set to "
                             + ReplicationType.SEGMENT
-                            + "or "
+                            + " or "
                             + DEFAULT_REPLICATION_TYPE_SETTING_SEGMENT.getKey()
                             + " should be set to "
                             + Boolean.TRUE

diff --git a/server/src/test/java/org/opensearch/index/IndexSettingsTests.java b/server/src/test/java/org/opensearch/index/IndexSettingsTests.java
@@ -869,7 +869,10 @@ public void testEnablingRemoteStoreFailsWhenReplicationTypeIsDocument() {
             IllegalArgumentException.class,
             () -> IndexMetadata.INDEX_REMOTE_STORE_ENABLED_SETTING.get(indexSettings)
         );
-        assertEquals("To enable index.remote_store.enabled, index.replication.type should be set to SEGMENT", iae.getMessage());
+        assertEquals(
+            "To enable index.remote_store.enabled, index.replication.type should be set to SEGMENT or opensearch.index.default.replication.type.segment should be set to true",
+            iae.getMessage()
+        );
     }
 
     public void testEnablingRemoteStoreFailsWhenReplicationTypeIsDefault() {
@@ -878,7 +881,10 @@ public void testEnablingRemoteStoreFailsWhenReplicationTypeIsDefault() {
             IllegalArgumentException.class,
             () -> IndexMetadata.INDEX_REMOTE_STORE_ENABLED_SETTING.get(indexSettings)
         );
-        assertEquals("To enable index.remote_store.enabled, index.replication.type should be set to SEGMENT", iae.getMessage());
+        assertEquals(
+            "To enable index.remote_store.enabled, index.replication.type should be set to SEGMENT or opensearch.index.default.replication.type.segment should be set to true",
+            iae.getMessage()
+        );
     }
 
     public void testRemoteRepositoryDefaultSetting() {