Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-30737][SPARK-27262][R][BUILD] Reenable CRAN check with UTF-8 encoding to DESCRIPTION #27472

Closed
wants to merge 2 commits into from
Closed

[SPARK-30737][SPARK-27262][R][BUILD] Reenable CRAN check with UTF-8 encoding to DESCRIPTION #27472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f35ec7
Reenable CRAN check
HyukjinKwon Feb 6, 2020
a613fb4
Test if other env issues are fixed (?)
HyukjinKwon Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions R/pkg/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ Collate:
RoxygenNote: 5.0.1
VignetteBuilder: knitr
NeedsCompilation: no
Encoding: UTF-8
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one, we had to revert before due to Jekins enviornment WIP. I think now it's all good to go.

7 changes: 1 addition & 6 deletions R/pkg/tests/fulltests/test_sparkSQL.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR piggybacks one fix here. It's just rather a nit fix to don't suppress warnings anymore introduced from #27460 to make tests pass.

})

test_that("create DataFrame with complex types", {
Expand Down
7 changes: 3 additions & 4 deletions R/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down