You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by fe...@apache.org on 2017/06/13 05:08:54 UTC
spark git commit: [TEST][SPARKR][CORE] Fix broken SparkSubmitSuite
Repository: spark
Updated Branches:
refs/heads/master 2639c3ed0 -> 278ba7a2c
[TEST][SPARKR][CORE] Fix broken SparkSubmitSuite
## What changes were proposed in this pull request?
Fix test file path. This is broken in #18264 and undetected since R-only changes don't build core and subsequent post-commit with the change built fine (again because it wasn't building core)
actually appveyor builds everything but it's not running scala suites ...
## How was this patch tested?
jenkins
srowen gatorsmile
Author: Felix Cheung <fe...@hotmail.com>
Closes #18283 from felixcheung/rsubmitsuite.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/278ba7a2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/278ba7a2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/278ba7a2
Branch: refs/heads/master
Commit: 278ba7a2c62b2cbb7bcfe79ce10d35ab57bb1950
Parents: 2639c3e
Author: Felix Cheung <fe...@hotmail.com>
Authored: Mon Jun 12 22:08:49 2017 -0700
Committer: Felix Cheung <fe...@apache.org>
Committed: Mon Jun 12 22:08:49 2017 -0700
----------------------------------------------------------------------
.../test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/278ba7a2/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
index de71999..b089357 100644
--- a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
@@ -505,8 +505,8 @@ class SparkSubmitSuite
assume(RUtils.isSparkRInstalled, "SparkR is not installed in this build.")
val main = MavenCoordinate("my.great.lib", "mylib", "0.1")
val sparkHome = sys.props.getOrElse("spark.test.home", fail("spark.test.home is not set!"))
- val rScriptDir =
- Seq(sparkHome, "R", "pkg", "inst", "tests", "packageInAJarTest.R").mkString(File.separator)
+ val rScriptDir = Seq(
+ sparkHome, "R", "pkg", "tests", "fulltests", "packageInAJarTest.R").mkString(File.separator)
assert(new File(rScriptDir).exists)
IvyTestUtils.withRepository(main, None, None, withR = true) { repo =>
val args = Seq(
@@ -527,7 +527,7 @@ class SparkSubmitSuite
// Check if the SparkR package is installed
assume(RUtils.isSparkRInstalled, "SparkR is not installed in this build.")
val rScriptDir =
- Seq(sparkHome, "R", "pkg", "inst", "tests", "testthat", "jarTest.R").mkString(File.separator)
+ Seq(sparkHome, "R", "pkg", "tests", "fulltests", "jarTest.R").mkString(File.separator)
assert(new File(rScriptDir).exists)
// compile a small jar containing a class that will be called from R code.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org