Better fix.

rxin · Jul 1, 2015 · de14836 · de14836
1 parent 6cff13a
commit de14836
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/UtilsSuite.scala
@@ -486,16 +486,16 @@ class UtilsSuite extends SparkFunSuite with ResetSystemProperties with Logging {
 
   // Test for using the util function to change our log levels.
   test("log4j log level change") {
+    val current = org.apache.log4j.Logger.getRootLogger().getLevel()
     try {
       Utils.setLogLevel(org.apache.log4j.Level.ALL)
       assert(log.isInfoEnabled())
       Utils.setLogLevel(org.apache.log4j.Level.ERROR)
       assert(!log.isInfoEnabled())
       assert(log.isErrorEnabled())
     } finally {
-      // Best effort at undoing changes this test made. Level should be synchronized with the
-      // log4j.properties file used for testing.
-      Utils.setLogLevel(org.apache.log4j.Level.INFO)
+      // Best effort at undoing changes this test made.
+      Utils.setLogLevel(current)
     }
   }