Skip to content

Commit da1caae

Browse files
committed
[SPARK-30737][SPARK-27262][R][BUILD] Reenable CRAN check with UTF-8 encoding to DESCRIPTION
### What changes were proposed in this pull request? This PR proposes to reenable CRAN check disabled at #27460. Given the tests #27468, seems we should also port #23823 together. ### Why are the changes needed? To check CRAN back. ### Does this PR introduce any user-facing change? No. ### How was this patch tested? It was tested at #27468 and Jenkins should test it out. Closes #27472 from HyukjinKwon/SPARK-30737. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]> (cherry picked from commit b95ccb1) Signed-off-by: HyukjinKwon <[email protected]>
1 parent d06a9df commit da1caae

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

R/pkg/DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@ Collate:
6262
RoxygenNote: 5.0.1
6363
VignetteBuilder: knitr
6464
NeedsCompilation: no
65+
Encoding: UTF-8

R/pkg/tests/fulltests/test_sparkSQL.R

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,7 @@ test_that("SPARK-17811: can create DataFrame containing NA as date and time", {
496496
expect_true(is.na(DF$date[2]))
497497
expect_equal(DF$date[1], as.Date("2016-10-01"))
498498
expect_true(is.na(DF$time[2]))
499-
# Warnings were suppressed due to Jenkins environment issues.
500-
# It shows both warnings as below in Jenkins:
501-
# - Your system is mis-configured: /etc/localtime is not a symlink
502-
# - It is strongly recommended to set environment variable TZ to
503-
# America/Los_Angeles (or equivalent)
504-
suppressWarnings(expect_equal(DF$time[1], as.POSIXlt("2016-01-10")))
499+
expect_equal(DF$time[1], as.POSIXlt("2016-01-10"))
505500
})
506501

507502
test_that("create DataFrame with complex types", {

R/run-tests.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ NUM_TEST_WARNING="$(grep -c -e 'Warnings ----------------' $LOGFILE)"
3131
# Also run the documentation tests for CRAN
3232
CRAN_CHECK_LOG_FILE=$FWDIR/cran-check.out
3333
rm -f $CRAN_CHECK_LOG_FILE
34-
# TODO(SPARK-30737) reenable this once packages are correctly installed in Jenkins
35-
# NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE
36-
# FAILED=$((PIPESTATUS[0]||$FAILED))
37-
touch $CRAN_CHECK_LOG_FILE
34+
35+
NO_TESTS=1 NO_MANUAL=1 $FWDIR/check-cran.sh 2>&1 | tee -a $CRAN_CHECK_LOG_FILE
36+
FAILED=$((PIPESTATUS[0]||$FAILED))
3837

3938
NUM_CRAN_WARNING="$(grep -c WARNING$ $CRAN_CHECK_LOG_FILE)"
4039
NUM_CRAN_ERROR="$(grep -c ERROR$ $CRAN_CHECK_LOG_FILE)"

0 commit comments

Comments
 (0)