From c50e3517ed8fe000b291e58de8c4ae0c7f84b2ce Mon Sep 17 00:00:00 2001 From: felixcheung Date: Sun, 17 Jan 2016 00:40:20 -0800 Subject: [PATCH 1/2] fix run-tests --- R/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/run-tests.sh b/R/run-tests.sh index e64a4ea94c58..9dcf0ace7d97 100755 --- a/R/run-tests.sh +++ b/R/run-tests.sh @@ -23,7 +23,7 @@ FAILED=0 LOGFILE=$FWDIR/unit-tests.out rm -f $LOGFILE -SPARK_TESTING=1 $FWDIR/../bin/sparkR --driver-java-options "-Dlog4j.configuration=file:$FWDIR/log4j.properties" --conf spark.hadoop.fs.default.name="file:///" $FWDIR/pkg/tests/run-all.R 2>&1 | tee -a $LOGFILE +SPARK_TESTING=1 $FWDIR/../bin/spark-submit --driver-java-options "-Dlog4j.configuration=file:$FWDIR/log4j.properties" --conf spark.hadoop.fs.default.name="file:///" $FWDIR/pkg/tests/run-all.R 2>&1 | tee -a $LOGFILE FAILED=$((PIPESTATUS[0]||$FAILED)) if [[ $FAILED != 0 ]]; then From fce70494214e96285d8f369cbdcc8951f6ad9e65 Mon Sep 17 00:00:00 2001 From: felixcheung Date: Sun, 17 Jan 2016 01:53:11 -0800 Subject: [PATCH 2/2] fix R test --- R/pkg/inst/tests/testthat/test_sparkSQL.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index 27ad9f395836..67ecdbc522d2 100644 --- a/R/pkg/inst/tests/testthat/test_sparkSQL.R +++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R @@ -1781,7 +1781,7 @@ test_that("Method coltypes() to get and set R's data types of a DataFrame", { expect_equal(coltypes(x), "map") df <- selectExpr(read.json(sqlContext, jsonPath), "name", "(age * 1.21) as age") - expect_equal(dtypes(df), list(c("name", "string"), c("age", "decimal(24,2)"))) + expect_equal(dtypes(df), list(c("name", "string"), c("age", "double"))) df1 <- select(df, cast(df$age, "integer")) coltypes(df) <- c("character", "integer")