restore in ESTestCase instead

Author: rjernst

test/framework/src/main/java/org/elasticsearch/cli/CommandTestCase.java

@@ -9,11 +9,8 @@
 
 package org.elasticsearch.cli;
 
-import org.elasticsearch.logging.Level;
-import org.elasticsearch.logging.internal.spi.LoggerFactory;
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matcher;
-import org.junit.After;
 import org.junit.Before;
 
 import java.io.IOException;
@@ -46,8 +43,6 @@ public abstract class CommandTestCase extends ESTestCase {
     /** The ES config dir */
     protected Path configDir;
 
-    private Level capturedLogLevel;
-
     /** Whether to include a whitespace in the file-system path. */
     private final boolean spaceInPath;
 
@@ -61,7 +56,6 @@ protected CommandTestCase(boolean spaceInPath) {
 
     @Before
     public void resetTerminal() throws IOException {
-        capturedLogLevel = LoggerFactory.provider().getRootLevel();
         terminal.reset();
         terminal.setSupportsBinary(false);
         terminal.setVerbosity(Terminal.Verbosity.NORMAL);
@@ -79,11 +73,6 @@ public void resetTerminal() throws IOException {
         envVars.clear();
     }
 
-    @After
-    public void restoreRootLogLevel() {
-        LoggerFactory.provider().setRootLevel(capturedLogLevel);
-    }
-
     /** Creates a Command to test execution. */
     protected abstract Command newCommand();
 

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -121,6 +121,7 @@
 import org.elasticsearch.indices.IndicesModule;
 import org.elasticsearch.indices.analysis.AnalysisModule;
 import org.elasticsearch.jdk.RuntimeVersionFeature;
+import org.elasticsearch.logging.internal.spi.LoggerFactory;
 import org.elasticsearch.plugins.AnalysisPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.scanners.StablePluginsRegistry;
@@ -263,6 +264,7 @@ public abstract class ESTestCase extends LuceneTestCase {
     private static final Collection<String> loggedLeaks = new ArrayList<>();
 
     private HeaderWarningAppender headerWarningAppender;
+    private org.elasticsearch.logging.Level capturedLogLevel;
 
     @AfterClass
     public static void resetPortCounter() {
@@ -584,6 +586,7 @@ public final void before() {
             this.threadContext = new ThreadContext(Settings.EMPTY);
             HeaderWarning.setThreadContext(threadContext);
         }
+        capturedLogLevel = LoggerFactory.provider().getRootLevel();
     }
 
     private static final List<CircuitBreaker> breakers = Collections.synchronizedList(new ArrayList<>());
@@ -618,6 +621,7 @@ protected boolean enableBigArraysReleasedCheck() {
 
     @After
     public final void after() throws Exception {
+        LoggerFactory.provider().setRootLevel(capturedLogLevel);
         if (enableBigArraysReleasedCheck()) {
             MockBigArrays.ensureAllArraysAreReleased();
         }