diff options
author | Kazuaki Ishizaki <ishizaki@jp.ibm.com> | 2015-12-24 13:37:28 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2015-12-24 13:37:28 +0000 |
commit | 392046611837a3a740ff97fa8177ca7c12316fb7 (patch) | |
tree | 3c5149701ceaec57d12dff971fc0a34c05669c31 /repl/src/test | |
parent | 9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47 (diff) | |
download | spark-392046611837a3a740ff97fa8177ca7c12316fb7.tar.gz spark-392046611837a3a740ff97fa8177ca7c12316fb7.tar.bz2 spark-392046611837a3a740ff97fa8177ca7c12316fb7.zip |
[SPARK-12311][CORE] Restore previous value of "os.arch" property in test suites after forcing to set specific value to "os.arch" property
Restore the original value of os.arch property after each test
Since some of tests forced to set the specific value to os.arch property, we need to set the original value.
Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com>
Closes #10289 from kiszk/SPARK-12311.
Diffstat (limited to 'repl/src/test')
-rw-r--r-- | repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala b/repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala index 1360f09e7f..05bf7a3aae 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala @@ -72,13 +72,16 @@ class ExecutorClassLoaderSuite } override def afterAll() { - super.afterAll() - if (classServer != null) { - classServer.stop() + try { + if (classServer != null) { + classServer.stop() + } + Utils.deleteRecursively(tempDir1) + Utils.deleteRecursively(tempDir2) + SparkEnv.set(null) + } finally { + super.afterAll() } - Utils.deleteRecursively(tempDir1) - Utils.deleteRecursively(tempDir2) - SparkEnv.set(null) } test("child first") { |