Skip to content

[SPARK-24535][SPARKR] fix tests on java check error #21666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
felixcheung wants to merge 5 commits into from
Closed

[SPARK-24535][SPARKR] fix tests on java check error #21666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6560e85
skip cran check test on windows or java version fail
felixcheung Jun 29, 2018
35ab8a2
fix
felixcheung Jun 29, 2018
a4f9b1e
do not show
felixcheung Jun 29, 2018
e1d1a64
fix windows
felixcheung Jul 3, 2018
8d9ef83
remove null check
felixcheung Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions R/pkg/R/client.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,20 @@ checkJavaVersion <- function() {

# If java is missing from PATH, we get an error in Unix and a warning in Windows
javaVersionOut <- tryCatch(
launchScript(javaBin, "-version", wait = TRUE, stdout = TRUE, stderr = TRUE),
error = function(e) {
stop("Java version check failed. Please make sure Java is installed",
" and set JAVA_HOME to point to the installation directory.", e)
},
warning = function(w) {
stop("Java version check failed. Please make sure Java is installed",
" and set JAVA_HOME to point to the installation directory.", w)
})
if (is_windows()) {
# See SPARK-24535
system2(javaBin, "-version", wait = TRUE, stdout = TRUE, stderr = TRUE)
} else {
launchScript(javaBin, "-version", wait = TRUE, stdout = TRUE, stderr = TRUE)
},
error = function(e) {
stop("Java version check failed. Please make sure Java is installed",
" and set JAVA_HOME to point to the installation directory.", e)
},
warning = function(w) {
stop("Java version check failed. Please make sure Java is installed",
" and set JAVA_HOME to point to the installation directory.", w)
})
javaVersionFilter <- Filter(
function(x) {
grepl(" version", x)
Expand All @@ -93,6 +98,7 @@ checkJavaVersion <- function() {
stop(paste("Java version", sparkJavaVersion, "is required for this package; found version:",
javaVersionStr))
}
return(javaVersionNum)
}

launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
Expand Down
2 changes: 1 addition & 1 deletion R/pkg/R/sparkR.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ sparkR.sparkContext <- function(
submitOps <- getClientModeSparkSubmitOpts(
Sys.getenv("SPARKR_SUBMIT_ARGS", "sparkr-shell"),
sparkEnvirMap)
checkJavaVersion()
invisible(checkJavaVersion())
launchBackend(
args = path,
sparkHome = sparkHome,
Expand Down
8 changes: 8 additions & 0 deletions R/pkg/inst/tests/testthat/test_basic.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
context("basic tests for CRAN")

test_that("create DataFrame from list or data.frame", {
tryCatch( checkJavaVersion(),
error = function(e) { skip("error on Java check") },
warning = function(e) { skip("warning on Java check") } )

sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE,
sparkConfig = sparkRTestConfig)

Expand Down Expand Up @@ -50,6 +54,10 @@ test_that("create DataFrame from list or data.frame", {
})

test_that("spark.glm and predict", {
tryCatch( checkJavaVersion(),
error = function(e) { skip("error on Java check") },
warning = function(e) { skip("warning on Java check") } )

sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE,
sparkConfig = sparkRTestConfig)

Expand Down