Add tags to 'testme' test scripts

HenrikBengtsson · HenrikBengtsson · commit 4acbe90bc67f · 2025-03-29T16:22:56.000-07:00
diff --git a/inst/testme/_epilogue/999.detritus-files.R b/inst/testme/_epilogue/999.detritus-files.R
@@ -7,7 +7,7 @@ if (basename(path) == "working_dir") {
   if (length(files) > 0L) {
     message(sprintf("Detritus 'Rscript*' files generated by test %s:", sQuote(testme[["name"]])))
     print(files)
-    
+
     ## Remove detritus files produced by this test script, so that
     ## other test scripts will not fail because of these files.
     unlink(files)
diff --git a/inst/testme/test-01-daemons.R b/inst/testme/test-01-daemons.R
@@ -1,5 +1,10 @@
+#' @tags daemons
+#' @tags detritus-files
+
 mirai::daemons(2)
 print(mirai::status())
 
 ## Give daemons a chance to shutdown
 Sys.sleep(10)
+
+options(future.mirai.detritus.file.count = 2L)
diff --git a/inst/testme/test-02-daemons-shutdown.R b/inst/testme/test-02-daemons-shutdown.R
@@ -1,3 +1,6 @@
+#' @tags daemons
+#' @tags detritus-files
+
 mirai::daemons(2)
 print(mirai::status())
 mirai::daemons(0)
diff --git a/inst/testme/test-demo.R b/inst/testme/test-demo.R
@@ -1,3 +1,6 @@
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 options(future.demo.mandelbrot.nrow = 2L)
diff --git a/inst/testme/test-dotdotdot.R b/inst/testme/test-dotdotdot.R
@@ -1,6 +1,9 @@
+#' @tags detritus-files
+#' @tags listenv
+#' @tags mirai_cluster mirai_multisession
+
 library(future.mirai)
 library(listenv)
-plan(sequential)
 
 message("*** Global argument '...' in futures ...")
 
diff --git a/inst/testme/test-future,labels.R b/inst/testme/test-future,labels.R
@@ -1,5 +1,7 @@
+#' @tags detritus-files
+#' @tags mirai_cluster mirai_multisession
+
 library(future.mirai)
-plan(sequential)
 
 message("*** Futures - labels ...")
 
diff --git a/inst/testme/test-future,lazy.R b/inst/testme/test-future,lazy.R
@@ -1,5 +1,7 @@
+#' @tags detritus-files
+#' @tags mirai_cluster mirai_multisession
+
 library(future.mirai)
-plan(sequential)
 
 message("*** Futures - lazy ...")
 
diff --git a/inst/testme/test-future.tests,mirai_cluster.R b/inst/testme/test-future.tests,mirai_cluster.R
@@ -1,11 +1,14 @@
+#' @tags detritus-files
+#' @tags mirai_cluster
+#' @tags future.tests
+
 if (requireNamespace("future.tests")) {
   ## FIXME: The following is disabled on MS Windows, because it will
   ## result in a 'R CMD check' NOTE on "detritus in the temp directory" [1].
   ## This happens whenever we use mirai::daemons(..., dispatcher = TRUE).
   ## [1] https://github.com/shikokuchuo/mirai/discussions/105
   dispatcher <- (.Platform[["OS.type"]] != "windows")
   if (isTRUE(dispatcher)) {
-    future::plan(future::sequential)
     mirai::daemons(0)  ## Reset any daemons running
     mirai::daemons(parallelly::availableCores())
     future.tests::check("future.mirai::mirai_cluster", timeout = 10.0, exit_value = FALSE)
diff --git a/inst/testme/test-future.tests-mirai_multisession.R b/inst/testme/test-future.tests-mirai_multisession.R
@@ -1,3 +1,7 @@
+#' @tags detritus-files
+#' @tags mirai_multisession
+#' @tags future.tests
+
 if (requireNamespace("future.tests")) {
   mirai::daemons(0)  ## Reset any daemons running
   
diff --git a/inst/testme/test-globals,formulas.R b/inst/testme/test-globals,formulas.R
@@ -1,7 +1,11 @@
+#' @tags globals
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
-library("datasets") ## cars data set
-library("stats")    ## lm(), poly(), xtabs()
+library(datasets) ## cars data set
+library(stats)    ## lm(), poly(), xtabs()
 
 plan(mirai_multisession)
 
diff --git a/inst/testme/test-globals,manual.R b/inst/testme/test-globals,manual.R
@@ -1,3 +1,7 @@
+#' @tags globals
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 plan(mirai_multisession)
diff --git a/inst/testme/test-globals,nested.R b/inst/testme/test-globals,nested.R
@@ -1,3 +1,7 @@
+#' @tags globals
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 plan(mirai_multisession)
diff --git a/inst/testme/test-globals,subassignment.R b/inst/testme/test-globals,subassignment.R
@@ -1,3 +1,7 @@
+#' @tags globals
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 plan(mirai_multisession)
@@ -127,4 +131,3 @@ message("*** Globals - subassignments w/ x$a <- value ... DONE")
 message("*** Globals - subassignments ... DONE")
 
 plan(sequential)
-
diff --git a/inst/testme/test-globals,tricky.R b/inst/testme/test-globals,tricky.R
@@ -1,3 +1,8 @@
+#' @tags globals
+#' @tags listenv
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 library(listenv)
 
diff --git a/inst/testme/test-mirai_cluster,worker-termination.R b/inst/testme/test-mirai_cluster,worker-termination.R
@@ -1,3 +1,7 @@
+#' @tags termination
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 message("*** mirai_multisession() - terminating workers ...")
diff --git a/inst/testme/test-nbrOfWorkers.R b/inst/testme/test-nbrOfWorkers.R
@@ -1,3 +1,7 @@
+#' @tags nbrOfWorkers
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 message("*** nbrOfWorkers() ...")
diff --git a/inst/testme/test-plan.R b/inst/testme/test-plan.R
@@ -1,3 +1,7 @@
+#' @tags plan
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 message("*** plan() ...")
 
 message("*** future::plan(future.mirai::mirai_multisession)")
@@ -7,7 +11,7 @@ future::plan(oplan)
 print(future::plan())
 
 
-library("future.mirai")
+library(future.mirai)
 
 for (type in c("mirai_multisession")) {
   mprintf("*** plan('%s') ...", type)
diff --git a/inst/testme/test-rng.R b/inst/testme/test-rng.R
@@ -1,3 +1,7 @@
+#' @tags rng
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 options(future.debug = FALSE)
@@ -11,13 +15,13 @@ message("- run() does not update RNG state")
 f1 <- future(1, lazy = TRUE)
 f2 <- future(2, lazy = TRUE)
 
-rng0 <- globalenv()$.Random.seed
+rng0 <- globalenv()[[".Random.seed"]]
 
 f1 <- run(f1)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 f2 <- run(f2)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 v1 <- value(f1)
 stopifnot(identical(v1, 1))
@@ -28,13 +32,13 @@ stopifnot(identical(v2, 2))
 
 message("- future() does not update RNG state")
 
-rng0 <- globalenv()$.Random.seed
+rng0 <- globalenv()[[".Random.seed"]]
 
 f1 <- future(1)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 f2 <- future(2)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 v1 <- value(f1)
 stopifnot(identical(v1, 1))
@@ -49,10 +53,10 @@ f1 <- future(1)
 f2 <- future(2)
 
 d1 <- resolved(f1)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 d2 <- resolved(f2)
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 v1 <- value(f1)
 stopifnot(identical(v1, 1))
@@ -68,11 +72,11 @@ f2 <- future(2)
 
 r1 <- result(f1)
 stopifnot(identical(r1$value, 1))
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 r2 <- result(f2)
 stopifnot(identical(r2$value, 2))
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 v1 <- value(f1)
 stopifnot(identical(v1, 1))
@@ -88,11 +92,11 @@ f2 <- future(2)
 
 v1 <- value(f1)
 stopifnot(identical(v1, 1))
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 v2 <- value(f2)
 stopifnot(identical(v2, 2))
-stopifnot(identical(globalenv()$.Random.seed, rng0))  ## RNG changed?
+stopifnot(identical(globalenv()[[".Random.seed"]], rng0))  ## RNG changed?
 
 message("*** RNG ... DONE")
 
diff --git a/inst/testme/test-stdout.R b/inst/testme/test-stdout.R
@@ -1,3 +1,7 @@
+#' @tags relays
+#' @tags detritus-files
+#' @tags mirai_multisession
+
 library(future.mirai)
 
 message("*** Standard output ...")
diff --git a/inst/testme/test-zzz,future_lapply.R b/inst/testme/test-zzz,future_lapply.R
@@ -1,5 +1,7 @@
-## This requires mirai (>= 0.13.2)
-if (packageVersion("mirai") >= "0.13.2") {
+#' @tags future.apply
+#' @tags listenv
+#' @tags detritus-files
+#' @tags mirai_multisession
 
 library(future.mirai)
 library(listenv)
@@ -141,6 +143,3 @@ if (requireNamespace("future.apply", quietly = TRUE)) {
   
   message("*** future_lapply() ... DONE")
 }
-
-
-}
diff --git a/tests/test-demo.R b/tests/test-demo.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-demo.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("demo")
diff --git a/tests/test-dotdotdot.R b/tests/test-dotdotdot.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-dotdotdot.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("dotdotdot")
diff --git a/tests/test-future,labels.R b/tests/test-future,labels.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-future,labels.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("future,labels")
diff --git a/tests/test-future,lazy.R b/tests/test-future,lazy.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-future,lazy.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("future,lazy")
diff --git a/tests/test-future.tests,mirai_cluster.R b/tests/test-future.tests,mirai_cluster.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-future.tests,mirai_cluster.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("future.tests,mirai_cluster")
diff --git a/tests/test-future.tests-mirai_multisession.R b/tests/test-future.tests-mirai_multisession.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-future.tests-mirai_multisession.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("future.tests-mirai_multisession")
diff --git a/tests/test-globals,formulas.R b/tests/test-globals,formulas.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-globals,formulas.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("globals,formulas")
diff --git a/tests/test-globals,manual.R b/tests/test-globals,manual.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-globals,manual.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("globals,manual")
diff --git a/tests/test-globals,nested.R b/tests/test-globals,nested.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-globals,nested.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("globals,nested")
diff --git a/tests/test-globals,subassignment.R b/tests/test-globals,subassignment.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-globals,subassignment.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("globals,subassignment")
diff --git a/tests/test-globals,tricky.R b/tests/test-globals,tricky.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-globals,tricky.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("globals,tricky")
diff --git a/tests/test-mirai_cluster,worker-termination.R b/tests/test-mirai_cluster,worker-termination.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-mirai_cluster,worker-termination.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("mirai_cluster,worker-termination")
diff --git a/tests/test-nbrOfWorkers.R b/tests/test-nbrOfWorkers.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-nbrOfWorkers.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("nbrOfWorkers")
diff --git a/tests/test-plan.R b/tests/test-plan.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-plan.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("plan")
diff --git a/tests/test-rng.R b/tests/test-rng.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-rng.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("rng")
diff --git a/tests/test-stdout.R b/tests/test-stdout.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-stdout.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("stdout")
diff --git a/tests/test-zzz,future_lapply.R b/tests/test-zzz,future_lapply.R
@@ -0,0 +1,3 @@
+## This runs testme test script incl/testme/test-zzz,future_lapply.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future.mirai:::testme("zzz,future_lapply")
