Fix get_gisbase error

OSGeo · Jan 21, 2025 · be868ad · be868ad
1 parent 4716073
commit be868ad
Show file tree

Hide file tree

Showing 3 changed files with 213 additions and 213 deletions.
diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
@@ -33,10 +33,10 @@ get_gisbase <- function() {
   if (Sys.info()["sysname"] == "Linux") {
     gisBase <- try(system2("grass", "--config path", stdout = TRUE), silent = TRUE)
   } else {
-    gisBase <- try(Sys.getenv("GRASS_INSTALLATION"), silent = TRUE)
+    gisBase <- Sys.getenv("GRASS_INSTALLATION")
   }
 
-  if (inherits(gisBase, "try-error")) {
+  if (inherits(gisBase, "try-error") | gisBase == "") {
     message("GRASS GIS not found on PATH")
     return(NULL)
   }

diff --git a/tests/testthat/test-execGRASS.R b/tests/testthat/test-execGRASS.R
@@ -56,10 +56,9 @@ test_that("testing basic doGRASS, execGRASS, stringexecGRASS", {
 
   # Try executing 'r.stats' command which will fail because "fire_blocksgg"
   # does not exist in the mapset
-  # TODO execGRASS error does not appear as an error on windows
-  expect_equal(
+  expect_error(
     res <- execGRASS("r.stats", input = "fire_blocksgg", flags = c("c", "n")),
-    1
+    "ERROR:"
   )
 
   # Test using an invalid parameter