spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felixche...@apache.org
Subject spark git commit: [SPARK-19399][SPARKR][BACKPORT-2.1] fix tests broken by merge
Date Thu, 16 Feb 2017 05:31:40 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.1 db7adb61b -> 252dd05f0


[SPARK-19399][SPARKR][BACKPORT-2.1] fix tests broken by merge

## What changes were proposed in this pull request?

fix test broken by git merge for #16739

## How was this patch tested?

manual

Author: Felix Cheung <felixcheung_m@hotmail.com>

Closes #16950 from felixcheung/fixrtest.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/252dd05f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/252dd05f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/252dd05f

Branch: refs/heads/branch-2.1
Commit: 252dd05f0d883bc7d4419308fe71bd817e6c814d
Parents: db7adb6
Author: Felix Cheung <felixcheung_m@hotmail.com>
Authored: Wed Feb 15 21:31:36 2017 -0800
Committer: Felix Cheung <felixcheung@apache.org>
Committed: Wed Feb 15 21:31:36 2017 -0800

----------------------------------------------------------------------
 R/pkg/inst/tests/testthat/test_sparkSQL.R | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/252dd05f/R/pkg/inst/tests/testthat/test_sparkSQL.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R
index 0447d24..d9dd0f3 100644
--- a/R/pkg/inst/tests/testthat/test_sparkSQL.R
+++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R
@@ -1229,7 +1229,6 @@ test_that("column functions", {
   c17 <- cov(c, c1) + cov("c", "c1") + covar_samp(c, c1) + covar_samp("c", "c1")
   c18 <- covar_pop(c, c1) + covar_pop("c", "c1")
   c19 <- spark_partition_id() + coalesce(c) + coalesce(c1, c2, c3)
-  c20 <- to_timestamp(c) + to_timestamp(c, "yyyy") + to_date(c, "yyyy")
 
   # Test if base::is.nan() is exposed
   expect_equal(is.nan(c("a", "b")), c(FALSE, FALSE))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message