Skip to content

Commit 0313fbb

Browse files
Remove FeatureFlagSetter.
-Replace `FeatureFlagSetter.clear` with `FeatureFlags.TestUtils.reset` in OpenSearchTestCase tearDown. Signed-off-by: Finn Carroll <[email protected]>
1 parent be7ea73 commit 0313fbb

File tree

2 files changed

+2
-67
lines changed

2 files changed

+2
-67
lines changed

Diff for: test/framework/src/main/java/org/opensearch/test/FeatureFlagSetter.java

-66
This file was deleted.

Diff for: test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
import org.opensearch.common.time.DateUtils;
8686
import org.opensearch.common.time.FormatNames;
8787
import org.opensearch.common.unit.TimeValue;
88+
import org.opensearch.common.util.FeatureFlags;
8889
import org.opensearch.common.util.MockBigArrays;
8990
import org.opensearch.common.util.MockPageCacheRecycler;
9091
import org.opensearch.common.util.concurrent.ThreadContext;
@@ -242,7 +243,7 @@ public static void resetPortCounter() {
242243
@Override
243244
public void tearDown() throws Exception {
244245
Schedulers.shutdownNow();
245-
FeatureFlagSetter.clear();
246+
FeatureFlags.TestUtils.reset();
246247
super.tearDown();
247248
}
248249

0 commit comments

Comments
 (0)