From 13d8c595e6c8f1f3ec009ba3dc36359427e3daf4 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 14 Apr 2022 10:16:21 -0500 Subject: [PATCH 1/5] skip safecallintor on 3.4 --- r/tests/testthat/test-safe-call-into-r.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/r/tests/testthat/test-safe-call-into-r.R b/r/tests/testthat/test-safe-call-into-r.R index e9438de58bee..1978a211db79 100644 --- a/r/tests/testthat/test-safe-call-into-r.R +++ b/r/tests/testthat/test-safe-call-into-r.R @@ -17,6 +17,8 @@ # Note that TestSafeCallIntoR is defined in safe-call-into-r-impl.cpp +skip_if_r_version("3.6") + test_that("SafeCallIntoR works from the main R thread", { skip_on_cran() From e20d1796791514da4de22aa530970ceff0ca0a34 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 14 Apr 2022 10:17:46 -0500 Subject: [PATCH 2/5] actualy save the file first --- r/tests/testthat/test-safe-call-into-r.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/tests/testthat/test-safe-call-into-r.R b/r/tests/testthat/test-safe-call-into-r.R index 1978a211db79..ff79a65c95dc 100644 --- a/r/tests/testthat/test-safe-call-into-r.R +++ b/r/tests/testthat/test-safe-call-into-r.R @@ -17,7 +17,7 @@ # Note that TestSafeCallIntoR is defined in safe-call-into-r-impl.cpp -skip_if_r_version("3.6") +skip_if_r_version("3.4") test_that("SafeCallIntoR works from the main R thread", { skip_on_cran() From 41caced26ade28cc04e106e48b52ee70d42fc548 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 14 Apr 2022 11:31:47 -0500 Subject: [PATCH 3/5] slightly different skip location --- r/tests/testthat/test-safe-call-into-r.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/r/tests/testthat/test-safe-call-into-r.R b/r/tests/testthat/test-safe-call-into-r.R index ff79a65c95dc..d97132c85053 100644 --- a/r/tests/testthat/test-safe-call-into-r.R +++ b/r/tests/testthat/test-safe-call-into-r.R @@ -17,8 +17,6 @@ # Note that TestSafeCallIntoR is defined in safe-call-into-r-impl.cpp -skip_if_r_version("3.4") - test_that("SafeCallIntoR works from the main R thread", { skip_on_cran() @@ -48,6 +46,7 @@ test_that("SafeCallIntoR works within RunWithCapturedR", { }) test_that("SafeCallIntoR errors from the non-R thread", { + skip_if_r_version("3.4") skip_on_cran() expect_error( From 975bdd5e7528611bc9d395dda98c9f89b9bf910d Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 14 Apr 2022 12:05:50 -0500 Subject: [PATCH 4/5] oops, needs to be 3.4.4 --- r/tests/testthat/test-safe-call-into-r.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/tests/testthat/test-safe-call-into-r.R b/r/tests/testthat/test-safe-call-into-r.R index d97132c85053..55cb68abdd32 100644 --- a/r/tests/testthat/test-safe-call-into-r.R +++ b/r/tests/testthat/test-safe-call-into-r.R @@ -46,7 +46,7 @@ test_that("SafeCallIntoR works within RunWithCapturedR", { }) test_that("SafeCallIntoR errors from the non-R thread", { - skip_if_r_version("3.4") + skip_if_r_version("3.4.4") skip_on_cran() expect_error( From 0d5057f0b033b72f0fd6258a10cda49419d174fb Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Thu, 14 Apr 2022 12:47:08 -0500 Subject: [PATCH 5/5] also skip some datetime + tzone tests on 3.4 --- r/tests/testthat/test-dplyr-funcs-datetime.R | 2 ++ r/tests/testthat/test-dplyr-funcs-type.R | 2 ++ 2 files changed, 4 insertions(+) diff --git a/r/tests/testthat/test-dplyr-funcs-datetime.R b/r/tests/testthat/test-dplyr-funcs-datetime.R index b9277c08c40f..bdfad733d21c 100644 --- a/r/tests/testthat/test-dplyr-funcs-datetime.R +++ b/r/tests/testthat/test-dplyr-funcs-datetime.R @@ -16,6 +16,8 @@ # under the License. skip_if(on_old_windows()) +# In 3.4 the lack of tzone attribute causes spurious failures +skip_if_r_version("3.4.4") library(lubridate, warn.conflicts = FALSE) library(dplyr, warn.conflicts = FALSE) diff --git a/r/tests/testthat/test-dplyr-funcs-type.R b/r/tests/testthat/test-dplyr-funcs-type.R index 6c9d9ac07a4a..aa6667420c0f 100644 --- a/r/tests/testthat/test-dplyr-funcs-type.R +++ b/r/tests/testthat/test-dplyr-funcs-type.R @@ -877,6 +877,8 @@ test_that("as.Date() converts successfully from date, timestamp, integer, char a test_that("format date/time", { skip_on_os("windows") # https://issues.apache.org/jira/browse/ARROW-13168 + # In 3.4 the lack of tzone attribute causes spurious failures + skip_if_r_version("3.4.4") times <- tibble( datetime = c(lubridate::ymd_hms("2018-10-07 19:04:05", tz = "Pacific/Marquesas"), NA),