More review feedback.

apache · Sep 23, 2014 · ec73f17 · ec73f17
1 parent 67f5b02
commit ec73f17
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/yarn/stable/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala b/yarn/stable/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala
@@ -37,10 +37,13 @@ class YarnClusterSuite extends FunSuite with BeforeAndAfterAll with Matchers {
   private var yarnCluster: MiniYARNCluster = _
   private var tempDir: File = _
   private var fakeSparkJar: File = _
+  private var oldConf: Map[String, String] = _
 
   override def beforeAll() {
     tempDir = Utils.createTempDir()
 
+    oldConf = sys.props.filter { case (k, v) => k.startsWith("spark.") }.toMap
+
     yarnCluster = new MiniYARNCluster(getClass().getName(), 1, 1, 1)
     yarnCluster.init(new YarnConfiguration())
     yarnCluster.start()
@@ -60,6 +63,7 @@ class YarnClusterSuite extends FunSuite with BeforeAndAfterAll with Matchers {
   override def afterAll() {
     yarnCluster.stop()
     sys.props.retain { case (k, v) => !k.startsWith("spark.") }
+    sys.props ++= oldConf
     super.afterAll()
   }