From 8f4bce57509f49ced59612fe666fc07831f2393d Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Thu, 19 Jan 2023 14:15:50 -0800 Subject: [PATCH] Apply OpenSearchIntegTestCase::featureFlagSettings by default (#5940) This commit applies any feature flags specified by a child class override of the featureFlagSettings() method by default. The result is that test implementations do not have to manually specify the featureFlagSettings when creating test nodes. Signed-off-by: Andrew Ross Signed-off-by: Andrew Ross (cherry picked from commit 7a511dd9ac7989d27d0b4aa7a0b0bf43fb36a91a) --- .../opensearch/snapshots/SearchableSnapshotIT.java | 13 +++++-------- .../opensearch/test/OpenSearchIntegTestCase.java | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java index 17c32bb407bc3..ec6d7e3a48e45 100644 --- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java @@ -41,19 +41,16 @@ public final class SearchableSnapshotIT extends AbstractSnapshotIntegTestCase { - @BeforeClass - public static void assumeFeatureFlag() { - assumeTrue( - "Searchable snapshot feature flag is enabled", - Boolean.parseBoolean(System.getProperty(FeatureFlags.SEARCHABLE_SNAPSHOT)) - ); - } - @Override protected boolean addMockInternalEngine() { return false; } + @Override + protected Settings featureFlagSettings() { + return Settings.builder().put(FeatureFlags.SEARCHABLE_SNAPSHOT, "true").build(); + } + @Override protected Settings.Builder randomRepositorySettings() { final Settings.Builder settings = Settings.builder(); diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java index 450cc256313f5..fd1a773b8c30b 100644 --- a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java @@ -1904,7 +1904,8 @@ protected Settings nodeSettings(int nodeOrdinal) { // randomly enable low-level search cancellation to make sure it does not alter results .put(SearchService.LOW_LEVEL_CANCELLATION_SETTING.getKey(), randomBoolean()) .putList(DISCOVERY_SEED_HOSTS_SETTING.getKey()) // empty list disables a port scan for other nodes - .putList(DISCOVERY_SEED_PROVIDERS_SETTING.getKey(), "file"); + .putList(DISCOVERY_SEED_PROVIDERS_SETTING.getKey(), "file") + .put(featureFlagSettings()); if (rarely()) { // Sometimes adjust the minimum search thread pool size, causing // QueueResizingOpenSearchThreadPoolExecutor to be used instead of a regular