diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2015-08-10 10:10:40 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-08-10 10:10:40 -0700 |
| commit | 0f3366a4c740147a7a7519922642912e2dd238f8 (patch) | |
| tree | 389d98ff8ea06644f041c99b3e78ff40960c6242 | |
| parent | e3fef0f9e17b1766a3869cb80ce7e4cd521cb7b6 (diff) | |
| download | spark-0f3366a4c740147a7a7519922642912e2dd238f8.tar.gz spark-0f3366a4c740147a7a7519922642912e2dd238f8.tar.bz2 spark-0f3366a4c740147a7a7519922642912e2dd238f8.zip | |
[SPARK-9710] [TEST] Fix RPackageUtilsSuite when R is not available.
RUtils.isRInstalled throws an exception if R is not installed,
instead of returning false. Fix that.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #8008 from vanzin/SPARK-9710 and squashes the following commits:
df72d8c [Marcelo Vanzin] [SPARK-9710] [test] Fix RPackageUtilsSuite when R is not available.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/r/RUtils.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala index 93b3bea578..427b2bc7cb 100644 --- a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala +++ b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala @@ -67,7 +67,11 @@ private[spark] object RUtils { /** Check if R is installed before running tests that use R commands. */ def isRInstalled: Boolean = { - val builder = new ProcessBuilder(Seq("R", "--version")) - builder.start().waitFor() == 0 + try { + val builder = new ProcessBuilder(Seq("R", "--version")) + builder.start().waitFor() == 0 + } catch { + case e: Exception => false + } } } |