[SPARK-9710] [TEST] Fix RPackageUtilsSuite when R is not available.

Marcelo Vanzin · shivaram · commit 6c6cadb8febb · 2015-09-23T07:38:31.000-07:00
RUtils.isRInstalled throws an exception if R is not installed, instead of returning false. Fix that. Author: Marcelo Vanzin <vanzin@cloudera.com> Closes apache#8008 from vanzin/SPARK-9710 and squashes the following commits: df72d8c [Marcelo Vanzin] [SPARK-9710] [test] Fix RPackageUtilsSuite when R is not available. (cherry picked from commit 0f3366a) Signed-off-by: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
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
@@ -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
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,11 @@ private[spark] object RUtils {`
`67`	`67`
`68`	`68`	`/** Check if R is installed before running tests that use R commands. */`
`69`	`69`	`def isRInstalled: Boolean = {`
`70`		`- val builder = new ProcessBuilder(Seq("R", "--version"))`
`71`		`- builder.start().waitFor() == 0`
	`70`	`+ try {`
	`71`	`+ val builder = new ProcessBuilder(Seq("R", "--version"))`
	`72`	`+ builder.start().waitFor() == 0`
	`73`	`+ } catch {`
	`74`	`+ case e: Exception => false`
	`75`	`+ }`
`72`	`76`	`}`
`73`	`77`	`}`