This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit 9e671ac105aebe9c3235e75aa367f59af40ed828
Author: Neal Richardson <neal.p.richard...@gmail.com>
AuthorDate: Wed Oct 14 08:03:54 2020 -0700

    ARROW-10270: [R] Fix CSV timestamp_parsers test on R-devel
    
    Also adds a GHA job that tests on R-devel so we catch issues like this 
sooner.
    
    Closes #8447 from nealrichardson/r-timestamp-test
    
    Authored-by: Neal Richardson <neal.p.richard...@gmail.com>
    Signed-off-by: Neal Richardson <neal.p.richard...@gmail.com>
---
 .github/workflows/r.yml     | 21 ++++++++++-----------
 r/tests/testthat/test-csv.R |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index 6f782c2..37aee19 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -92,21 +92,20 @@ jobs:
         continue-on-error: true
         run: archery docker push ubuntu-r
 
-  rstudio:
-    name: "rstudio/r-base:${{ matrix.r_version }}-${{ matrix.r_image }}"
+  bundled:
+    name: "${{ matrix.config.org }}/${{ matrix.config.image }}:${{ 
matrix.config.tag }}"
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     strategy:
       fail-fast: false
       matrix:
-        # See https://hub.docker.com/r/rstudio/r-base
-        r_version: ["4.0"]
-        r_image:
-          - centos7
+        config:
+          - {org: 'rstudio', image: 'r-base', tag: '4.0-centos7'}
+          - {org: 'rhub', image: 'debian-gcc-devel', tag: 'latest'}
     env:
-      R_ORG: rstudio
-      R_IMAGE: r-base
-      R_TAG: ${{ matrix.r_version }}-${{ matrix.r_image }}
+      R_ORG: ${{ matrix.config.org }}
+      R_IMAGE: ${{ matrix.config.image }}
+      R_TAG: ${{ matrix.config.tag }}
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@v2
@@ -120,8 +119,8 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .docker
-          key: ${{ matrix.r_image }}-r-${{ hashFiles('cpp/**') }}
-          restore-keys: ${{ matrix.r_image }}-r-
+          key: ${{ matrix.config.image }}-r-${{ hashFiles('cpp/**') }}
+          restore-keys: ${{ matrix.config.image }}-r-
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
diff --git a/r/tests/testthat/test-csv.R b/r/tests/testthat/test-csv.R
index 94dd10b..3de70b3 100644
--- a/r/tests/testthat/test-csv.R
+++ b/r/tests/testthat/test-csv.R
@@ -212,11 +212,11 @@ test_that("read_csv_arrow() can read timestamps", {
   tf <- tempfile(); on.exit(unlink(tf))
   write.csv(tbl, tf, row.names = FALSE)
 
-  df <- read_csv_arrow(tf, col_types = schema(time = timestamp()))
+  df <- read_csv_arrow(tf, col_types = schema(time = timestamp(timezone = 
"UTC")))
   expect_equal(tbl, df)
 
   df <- read_csv_arrow(tf, col_types = "t", col_names = "time", skip = 1)
-  expect_equal(tbl, df)
+  expect_equal(tbl, df, check.tzone = FALSE) # col_types = "t" makes 
timezone-naive timestamp
 })
 
 test_that("read_csv_arrow(timestamp_parsers=)", {

Reply via email to