From 8db418f969267d55759421e2851c0b812e39dfd9 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Tue, 18 Apr 2017 19:24:41 +0900
Subject: [PATCH] Reset log levels reliably.

---
 src/test/java/com/zaxxer/hikari/pool/MiscTest.java         | 7 ++++---
 .../com/zaxxer/hikari/pool/TestConnectionTimeoutRetry.java | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/zaxxer/hikari/pool/MiscTest.java b/src/test/java/com/zaxxer/hikari/pool/MiscTest.java
index f9698efa..2791f3cd 100644
--- a/src/test/java/com/zaxxer/hikari/pool/MiscTest.java
+++ b/src/test/java/com/zaxxer/hikari/pool/MiscTest.java
@@ -102,7 +102,7 @@ public class MiscTest
       try (PrintStream ps = new PrintStream(baos, true)) {
          setSlf4jTargetStream(Class.forName("com.zaxxer.hikari.pool.ProxyLeakTask"), ps);
          setConfigUnitTest(true);
-   
+
          HikariConfig config = newHikariConfig();
          config.setMinimumIdle(0);
          config.setMaximumPoolSize(4);
@@ -110,11 +110,11 @@ public class MiscTest
          config.setMetricRegistry(null);
          config.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(1));
          config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
-   
+
          try (HikariDataSource ds = new HikariDataSource(config)) {
             setSlf4jLogLevel(HikariPool.class, Level.DEBUG);
             getPool(ds).logPoolState();
-   
+
             try (Connection connection = ds.getConnection()) {
                quietlySleep(SECONDS.toMillis(4));
                connection.close();
@@ -128,6 +128,7 @@ public class MiscTest
          finally
          {
             setConfigUnitTest(false);
+            setSlf4jLogLevel(HikariPool.class, Level.INFO);
          }
       }
    }
diff --git a/src/test/java/com/zaxxer/hikari/pool/TestConnectionTimeoutRetry.java b/src/test/java/com/zaxxer/hikari/pool/TestConnectionTimeoutRetry.java
index 15f8974d..27605438 100644
--- a/src/test/java/com/zaxxer/hikari/pool/TestConnectionTimeoutRetry.java
+++ b/src/test/java/com/zaxxer/hikari/pool/TestConnectionTimeoutRetry.java
@@ -251,9 +251,9 @@ public class TestConnectionTimeoutRetry
             Connection connection5 = ds.getConnection();
             Connection connection6 = ds.getConnection();
             Connection connection7 = ds.getConnection()) {
-   
+
             sleep(1300);
-   
+
             assertSame("Total connections not as expected", 10, pool.getTotalConnections());
             assertSame("Idle connections not as expected", 3, pool.getIdleConnections());
          }
@@ -273,5 +273,6 @@ public class TestConnectionTimeoutRetry
    public void after()
    {
       System.getProperties().remove("com.zaxxer.hikari.housekeeping.periodMs");
+      setSlf4jLogLevel(HikariPool.class, Level.INFO);
    }
 }