Repository: spark Updated Branches: refs/heads/branch-2.0 2c1b6b58d -> a2f68ded2
[SPARK-15637][SPARKR] fix R tests on R 3.2.2 ## What changes were proposed in this pull request? Change version check in R tests ## How was this patch tested? R tests shivaram Author: felixcheung <[email protected]> Closes #13369 from felixcheung/rversioncheck. (cherry picked from commit 74c1b79f3f82751d166bccba877501a8cabc9b7c) Signed-off-by: Shivaram Venkataraman <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a2f68ded Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a2f68ded Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a2f68ded Branch: refs/heads/branch-2.0 Commit: a2f68ded22d5d8727311fb039714400cbf48156a Parents: 2c1b6b5 Author: felixcheung <[email protected]> Authored: Sat May 28 10:32:40 2016 -0700 Committer: Shivaram Venkataraman <[email protected]> Committed: Sat May 28 10:32:48 2016 -0700 ---------------------------------------------------------------------- R/pkg/inst/tests/testthat/test_context.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a2f68ded/R/pkg/inst/tests/testthat/test_context.R ---------------------------------------------------------------------- diff --git a/R/pkg/inst/tests/testthat/test_context.R b/R/pkg/inst/tests/testthat/test_context.R index 15915e2..1d56ced 100644 --- a/R/pkg/inst/tests/testthat/test_context.R +++ b/R/pkg/inst/tests/testthat/test_context.R @@ -28,7 +28,7 @@ test_that("Check masked functions", { "colnames", "colnames<-", "intersect", "rank", "rbind", "sample", "subset", "summary", "transform", "drop", "window", "as.data.frame") namesOfMaskedCompletely <- c("cov", "filter", "sample") - if (as.numeric(R.version$major) == 3 && as.numeric(R.version$minor) > 2) { + if (as.numeric(R.version$major) >= 3 && as.numeric(R.version$minor) >= 3) { namesOfMasked <- c("endsWith", "startsWith", namesOfMasked) namesOfMaskedCompletely <- c("endsWith", "startsWith", namesOfMaskedCompletely) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
