fix 'test_all' condition in all tests

UrbanAnalyst · Feb 13, 2025 · c107977 · c107977
1 parent 37e0ed0
commit c107977
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 28 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.4.1.050
+Version: 0.4.1.051
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

diff --git a/codemeta.json b/codemeta.json
@@ -11,7 +11,7 @@
   "codeRepository": "https://github.com/UrbanAnalyst/dodgr",
   "issueTracker": "https://github.com/UrbanAnalyst/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.4.1.050",
+  "version": "0.4.1.051",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/tests/testthat/test-cache.R b/tests/testthat/test-cache.R
@@ -2,8 +2,8 @@
 # GitHub runners.
 testthat::skip_on_os ("windows")
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 testthat::skip_if (!test_all)
 

diff --git a/tests/testthat/test-centrality.R b/tests/testthat/test-centrality.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 # testthat::skip_on_cran ()
 testthat::skip_if (!test_all)

diff --git a/tests/testthat/test-deduplicate.R b/tests/testthat/test-deduplicate.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 # testthat::skip_if (!test_all)
 

diff --git a/tests/testthat/test-dists-categorical.R b/tests/testthat/test-dists-categorical.R
@@ -1,7 +1,7 @@
 context ("dodgr_dists_categorical")
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 if (!test_all) {
     RcppParallel::setThreadOptions (numThreads = 2)

diff --git a/tests/testthat/test-dists-nearest.R b/tests/testthat/test-dists-nearest.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 if (!test_all) {
     RcppParallel::setThreadOptions (numThreads = 2)

diff --git a/tests/testthat/test-dists.R b/tests/testthat/test-dists.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 if (!test_all) {
     RcppParallel::setThreadOptions (numThreads = 2)

diff --git a/tests/testthat/test-flows.R b/tests/testthat/test-flows.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 testthat::skip_on_cran ()
 

diff --git a/tests/testthat/test-graph-fns.R b/tests/testthat/test-graph-fns.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 skip_if (!test_all)
 

diff --git a/tests/testthat/test-iso.R b/tests/testthat/test-iso.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 if (!test_all) {
     RcppParallel::setThreadOptions (numThreads = 2)

diff --git a/tests/testthat/test-match-pts-fns.R b/tests/testthat/test-match-pts-fns.R
@@ -1,5 +1,5 @@
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 skip_if (!test_all)
 

diff --git a/tests/testthat/test-save-load.R b/tests/testthat/test-save-load.R
@@ -1,8 +1,8 @@
 testthat::skip_on_cran ()
 testthat::skip_on_os ("mac")
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 if (!test_all) {
     RcppParallel::setThreadOptions (numThreads = 2)

diff --git a/tests/testthat/test-sc.R b/tests/testthat/test-sc.R
@@ -1,7 +1,7 @@
 context ("SC")
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 
 skip_if (!test_all)
 

diff --git a/tests/testthat/test-streetnet.R b/tests/testthat/test-streetnet.R
@@ -1,8 +1,8 @@
 dodgr_cache_off ()
 clear_dodgr_cache ()
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL", "false"), "true") ||
-    identical (Sys.getenv ("GITHUB_WORKFLOW", "nope"), "test-coverage"))
+test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") ||
+    identical (Sys.getenv ("GITHUB_JOB"), "test-coverage"))
 # used below in a skip_if call
 
 test_that ("streetnet bbox", {