restore skip_on_ci()

JanMarvin · Sep 2, 2023 · 8c02006 · 8c02006
1 parent 30573dc
commit 8c02006
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
@@ -1000,6 +1000,11 @@ testfile_path <- function(x, replace = FALSE) {
 
   fl <- testthat::test_path("testfiles", x)
 
+  if (Sys.getenv("openxlsx2_testthat_fullrun") == "") {
+    if (length(capture.output(try(testthat::skip_on_ci()))))
+      return(testthat::skip("Testfile does not exist"))
+  }
+
   # try to download
   if (!file.exists(fl) || replace) {
     # relies on libcurl and was optional in R < 4.2.0 on Windows

diff --git a/tests/testthat/test-aaa.R b/tests/testthat/test-aaa.R
@@ -2,8 +2,4 @@ test_that("testsetup", {
 
   options("openxlsx2.datetimeCreated" = as.POSIXct("2023-07-20 23:32:14"))
 
-  if (Sys.getenv("openxlsx2_testthat_fullrun") == "") {
-    skip_on_ci()
-  }
-
 })