add cleanup procedure for testsuite to add deferred removal of nc_bas…

…ic_spm_grass7
OSGeo · Feb 6, 2025 · 588639b · 588639b
1 parent efee284
commit 588639b
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -35,12 +35,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y grass-dev libgdal-dev libudunits2-dev libharfbuzz-dev libfribidi-dev
 
-      - name: Download test dataset
-        run: |
-          wget https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip -O /tmp/nc_basic_spm_grass7.zip
-          unzip /tmp/nc_basic_spm_grass7.zip -d /tmp/grassdb
-          rm /tmp/nc_basic_spm_grass7.zip
-
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::rcmdcheck, any::terra

diff --git a/.github/workflows/check-releasebranch.yaml b/.github/workflows/check-releasebranch.yaml
@@ -58,16 +58,6 @@ jobs:
         R -e "install.packages(c('remotes', 'rcmdcheck'))"
         R -e "remotes::install_deps(dependencies = TRUE)"
         R -e "install.packages('terra', repos = 'https://cloud.r-project.org/', type = 'source')"
-
-    - name: Download test dataset
-      run: |
-        wget https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip -O /tmp/nc_basic_spm_grass7.zip
-        unzip /tmp/nc_basic_spm_grass7.zip -d /tmp/grassdb
-        rm /tmp/nc_basic_spm_grass7.zip
-      
-    # - name: Run R CMD check
-    #   run: |
-    #     R -e "rcmdcheck::rcmdcheck(args = c('--no-manual', '--no-build-vignettes'), error_on = 'error', check_dir = 'check')"
     
     - uses: r-lib/actions/check-r-package@v2
       with:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -22,7 +22,9 @@ Suggests:
     stars,
     raster (>= 3.6-3),
     codetools,
-    testthat (>= 3.0.0)
+    testthat (>= 3.0.0),
+    withr,
+    fs
 VignetteBuilder: knitr
 SystemRequirements: GRASS (>= 7)
 License: GPL (>= 2)

diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
@@ -1,9 +1,5 @@
 download_nc_basic <- function() {
-  if (Sys.info()["sysname"] == "Linux") {
-    tmpdir <- "/tmp"
-  } else{
-    tmpdir <- tempdir()
-  }
+  tmpdir <- tempdir()
 
   if (!file.exists(file.path(tmpdir, "nc_basic_spm_grass7.zip"))) {
     base_url <- "https://grass.osgeo.org/sampledata"

diff --git a/tests/testthat/test-execGRASS.R b/tests/testthat/test-execGRASS.R
@@ -4,6 +4,8 @@ source("helper.R")
 
 # setup
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 test_that("testing basic doGRASS, execGRASS, stringexecGRASS", {

diff --git a/tests/testthat/test-gmeta.R b/tests/testthat/test-gmeta.R
@@ -4,6 +4,8 @@ source("helper.R")
 
 # setup
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 testthat::test_that("testing gmeta", {

diff --git a/tests/testthat/test-initGRASS.R b/tests/testthat/test-initGRASS.R
@@ -4,6 +4,8 @@ source("helper.R")
 
 # setup
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 test_that("testing basic initGRASS", {

diff --git a/tests/testthat/test-options.R b/tests/testthat/test-options.R
@@ -4,6 +4,8 @@ source("helper.R")
 
 # setup
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 test_that("testing ignore.stderrOption", {

diff --git a/tests/testthat/test-read_RAST.R b/tests/testthat/test-read_RAST.R
@@ -5,6 +5,8 @@ source("helper.R")
 
 # setup (share grass session across tests)
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 if (!is.null(gisBase)) {

diff --git a/tests/testthat/test-read_VECT.R b/tests/testthat/test-read_VECT.R
@@ -4,6 +4,8 @@ source("helper.R")
 
 # setup (share grass session across tests)
 testdata <- download_nc_basic()
+withr::defer(fs::dir_delete(testdata$gisDbase))
+
 gisBase <- get_gisbase()
 
 # test basic read_VECT operation