Register error listener in evil logger tests

This test needs an error listener registered since we configure logging here.
elastic · Apr 13, 2017 · edd16fa · edd16fa
1 parent a1c2fe9
commit edd16fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java b/core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java
@@ -81,6 +81,7 @@ public void log(StatusData data) {
      * logged by the status logger before logging is configured.
      */
     public static void registerErrorListener() {
+        error.set(false);
         StatusLogger.getLogger().registerListener(ERROR_LISTENER);
     }
 

diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java
@@ -51,6 +51,12 @@
 
 public class EvilLoggerTests extends ESTestCase {
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        LogConfigurator.registerErrorListener();
+    }
+
     @Override
     public void tearDown() throws Exception {
         LoggerContext context = (LoggerContext) LogManager.getContext(false);