Skip R-devel

ThinkR-open · Jul 4, 2024 · 6454db2 · 6454db2
1 parent 728d791
commit 6454db2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/dev/flat_dock_from_renv.Rmd b/dev/flat_dock_from_renv.Rmd
@@ -343,8 +343,7 @@ test_that("dock_from_renv works", {
     out,
     "R6"
   )
-  #python3 is not a direct dependencies from custom_packages
-  expect_false(  any(grepl("python3",out$Dockerfile)))
+
 
   # read Dockerfile
   out$write(
@@ -370,7 +369,10 @@ test_that("dock_from_renv works", {
     1
   )
 
-
+  skip_if(is_rdevel, "Skip R-devel")
+  #python3 is not a direct dependencies from custom_packages
+  expect_false(  any(grepl("python3",out$Dockerfile)))
+  
   # System dependencies are different when build in interactive environment?
   # yes.  strange.
   skip_if_not(interactive())
@@ -420,6 +422,7 @@ test_that("dock_from_renv works with full dependencies", {
     out,
     "R6"
   )
+  skip_if(is_rdevel, "Skip R-devel")
   #python3 is  a un-direct dependencies from custom_packages
   expect_true(  any(grepl("python3",out$Dockerfile)))
 })

diff --git a/tests/testthat/setup_cache_dir.R b/tests/testthat/setup_cache_dir.R
@@ -1,3 +1,5 @@
 R_USER_CACHE_DIR<-tempfile()
 dir.create(R_USER_CACHE_DIR)
 Sys.setenv("R_USER_CACHE_DIR"=R_USER_CACHE_DIR)
+r_version <- R.Version()$version.string
+is_rdevel <- grepl("unstable", r_version)
diff --git a/tests/testthat/test-dock_from_desc.R b/tests/testthat/test-dock_from_desc.R
@@ -57,12 +57,8 @@ withr::with_dir(
           tpf
         )
       )
-      expect_true(
-        grepl(
-          "apt-get update && apt-get install",
-          tpf
-        )
-      )
+
+
       expect_true(
         grepl(
           "mkdir /build_zone",
@@ -92,6 +88,26 @@ withr::with_dir(
       # Only if package I guess
       # expect_true(file.exists(file.path(descdir, ".Rbuildignore")))
       expect_true(file.exists(file.path(descdir, ".dockerignore")))
+
+
+
+
+
+
+
+
+
+      skip_if(is_rdevel, "Skippé sous R-devel")
+
+      expect_true(
+        grepl(
+          "apt-get update && apt-get install",
+          tpf
+        )
+      )
+
+
+
     })
   }
 )
diff --git a/tests/testthat/test-dock_from_renv.R b/tests/testthat/test-dock_from_renv.R
@@ -52,8 +52,7 @@ test_that("dock_from_renv works", {
     out,
     "R6"
   )
-  #python3 is not a direct dependencies from custom_packages
-  expect_false(  any(grepl("python3",out$Dockerfile)))
+
 
   # read Dockerfile
   out$write(
@@ -78,8 +77,9 @@ test_that("dock_from_renv works", {
     grep("RUN R -e 'renv::restore\\(\\)'", dock_created),
     1
   )
-
-
+  skip_if(is_rdevel, "Skip R-devel")
+  #python3 is not a direct dependencies from custom_packages
+  expect_false(  any(grepl("python3",out$Dockerfile)))
   # System dependencies are different when build in interactive environment?
   # yes.  strange.
   skip_if_not(interactive())
@@ -129,6 +129,7 @@ test_that("dock_from_renv works with full dependencies", {
     out,
     "R6"
   )
+  skip_if(is_rdevel, "Skip R-devel")
   #python3 is  a un-direct dependencies from custom_packages
   expect_true(  any(grepl("python3",out$Dockerfile)))
 })
@@ -214,10 +215,10 @@ socle_install_version <- "remotes::install_version\\(\"renv\", version = \""
                info = paste(lf," & ",renv_version))
 
 
-}}  
-  
-  
-  
+}}
+
+
+
 
 })
 
diff --git a/tests/testthat/test-get_sysreqs.R b/tests/testthat/test-get_sysreqs.R
@@ -1,5 +1,6 @@
 test_that("get_sysreqs works", {
   skip_on_cran()
+  skip_if(is_rdevel, "Skip R-devel")
   res <- get_sysreqs(
     c("mongolite"),
     quiet = TRUE