diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 95d3e52bef3a..c8cb1c3a992a 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -62,3 +62,4 @@ Collate: RoxygenNote: 5.0.1 VignetteBuilder: knitr NeedsCompilation: no +Encoding: UTF-8 diff --git a/R/pkg/tests/fulltests/test_sparkSQL.R b/R/pkg/tests/fulltests/test_sparkSQL.R index 23fadc4373c3..c1d277ac84be 100644 --- a/R/pkg/tests/fulltests/test_sparkSQL.R +++ b/R/pkg/tests/fulltests/test_sparkSQL.R @@ -496,12 +496,7 @@ test_that("SPARK-17811: can create DataFrame containing NA as date and time", { expect_true(is.na(DF$date[2])) expect_equal(DF$date[1], as.Date("2016-10-01")) expect_true(is.na(DF$time[2])) - # Warnings were suppressed due to Jenkins environment issues. - # It shows both warnings as below in Jenkins: - # - Your system is mis-configured: /etc/localtime is not a symlink - # - It is strongly recommended to set environment variable TZ to - # America/Los_Angeles (or equivalent) - suppressWarnings(expect_equal(DF$time[1], as.POSIXlt("2016-01-10"))) + expect_equal(DF$time[1], as.POSIXlt("2016-01-10")) }) test_that("create DataFrame with complex types", { diff --git a/R/run-tests.sh b/R/run-tests.sh index 782b5f5baeba..51ca7d600caf 100755 --- a/R/run-tests.sh +++ b/R/run-tests.sh @@ -31,10 +31,9 @@ NUM_TEST_WARNING="$(grep -c -e 'Warnings ----------------' $LOGFILE)" # Also run the documentation tests for CRAN CRAN_CHECK_LOG_FILE=$FWDIR/cran-check.out rm -f $CRAN_CHECK_LOG_FILE -# TODO(SPARK-30737) reenable this once packages are correctly installed in Jenkins -# NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE -# FAILED=$((PIPESTATUS[0]||$FAILED)) -touch $CRAN_CHECK_LOG_FILE + +NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE +FAILED=$((PIPESTATUS[0]||$FAILED)) NUM_CRAN_WARNING="$(grep -c WARNING$ $CRAN_CHECK_LOG_FILE)" NUM_CRAN_ERROR="$(grep -c ERROR$ $CRAN_CHECK_LOG_FILE)"