Add test for makeClusterSequential() cluster futures

Author: HenrikBengtsson

NEWS.md

@@ -43,8 +43,8 @@
    deprecation warnings. Deprecated also hidden argument `local`,
    which was kept around for legacy reasons.
 
- * Use of `plan(..., earlySignal = ...)` is now defunct and produces a
-   deprecation warning.
+ * Use of `plan(..., earlySignal = ...)` is now deprecated and
+   produces a deprecation warning.
 
  * Remove argument `run` from `resolved()`. Attempts to set it
    produces a deprecation warning.

inst/testme/run.R

@@ -13,34 +13,34 @@
 #' inst/testme/run.R <test-name.R>
 #'
 #' Options:
-#' --package=<pkg>  The name of the package being tested
-#'                  (Environment variable: `R_TESTME_PACKAGE`)
-#'                  (Default: The `Package` field of the DESCRIPTION file)
-#' --name=<name>    The name of the test to run, used to locate the test
-#'                  script `test-<name>.R`
-#'                  (Environment variable: `R_TESTME_NAME`)
-#' --not-cran       Set environment variable `NOT_CRAN=true`
-#' --covr=summary   Estimate test code coverage with basic summary
-#' --covr=tally     Estimate test code coverage with full tally summary
-#' --covr=report    Estimate test code coverage with full HTML report
-#' --debug          Output debug messages
-#'                  (Environment variable: `R_TESTME_DEBUG`)
+#' --package=<pkg>     The name of the package being tested
+#'                     (Environment variable: `R_TESTME_PACKAGE`)
+#'                     (Default: The `Package` field of the DESCRIPTION file)
+#' --name=<name>       The name of the test to run, used to locate the test
+#'                     script `test-<name>.R`
+#'                     (Environment variable: `R_TESTME_NAME`)
+#' --not-cran          Set environment variable `NOT_CRAN=true`
+#' --coverage=summary  Estimate test code coverage with basic summary
+#' --coverage=tally    Estimate test code coverage with full tally summary
+#' --coverage=report   Estimate test code coverage with full HTML report
+#' --debug             Output debug messages
+#'                     (Environment variable: `R_TESTME_DEBUG`)
 #'
 #' Examples:
 #' testme/test-abc.R
 #' testme/test-abc.R --not-cran
-#' tests/test-cpuLoad.R --covr=report
+#' tests/test-cpuLoad.R --coverage=report
 #'
 #' inst/testme/run.R inst/testme/test-abc.R
-#' inst/testme/run.R inst/testme/test-abc.R --covr
+#' inst/testme/run.R inst/testme/test-abc.R --coverage
 #'
 #' Environment variables:
 #' * R_TESTME_PACKAGE
 #' * R_TESTME_NAME
 #' * R_TESTME_PATH
 #' * R_TESTME_FILTER_NAME
 #' * R_TESTME_FILTER_TAGS
-#' * R_TESTME_COVR
+#' * R_TESTME_COVERAGE
 #' * R_TESTME_DEBUG
 main <- function() {
   cmd_args <- commandArgs(trailingOnly = TRUE)
@@ -99,26 +99,21 @@ main <- function() {
     Sys.setenv(R_TESTME_DEBUG = "TRUE")
   }
 
-  pattern <- "^--covr(|=([[:alpha:][:alnum:]]+))$"
+  pattern <- "^--coverage(|=([[:alpha:][:alnum:]]+))$"
   idx <- grep(pattern, cmd_args)
   if (length(idx) > 0L) {
     value <- gsub(pattern, "\\2", cmd_args[idx])
     if (!nzchar(value)) {
-      covr <- "summary"
+      coverage <- "summary"
     } else {
-      covr <- match.arg(value, choices = c("summary", "tally", "report"))
+      coverage <- match.arg(value, choices = c("none", "summary", "tally", "report"))
     }
     cmd_args <- cmd_args[-idx]
   } else {
-    value <- Sys.getenv("R_TESTME_COVR", "FALSE")
-    if (toupper(value) %in% c("FALSE", "TRUE")) {
-      value <- as.logical(value)
-      covr <- if (value) "summary" else "none"
-    } else {
-      covr <- match.arg(value, choices = c("summary", "tally", "report"))
-    }
+    value <- Sys.getenv("R_TESTME_COVERAGE", "none")
+    coverage <- match.arg(value, choices = c("none", "summary", "tally", "report"))
   }
-  if (covr != "none") {
+  if (coverage != "none") {
     if (!utils::file_test("-f", "DESCRIPTION")) {
       stop("Current folder does not look like a package folder")
     }
@@ -179,7 +174,9 @@ main <- function() {
   }
 
   debug <- isTRUE(as.logical(Sys.getenv("R_TESTME_DEBUG")))
-  
+
+  coverage <- match.arg(coverage, choices = c("none", "summary", "tally", "report"))
+
   ## Create 'testme' environment on the search() path
   testme_config <- list(
      testme = TRUE,
@@ -191,14 +188,14 @@ main <- function() {
      script = testme_file,
        path = path,
     on_cran = on_cran(),
-       covr = covr,
+       coverage = coverage,
       debug = debug
   )
   if ("testme" %in% search()) detach(name = "testme")
   testme <- attach(testme_config, name = "testme", warn.conflicts = FALSE)
   rm(list = c("tags", "testme_package", "testme_name", "testme_file"))
 
-  
+
   ## -----------------------------------------------------------------
   ## Filters
   ## -----------------------------------------------------------------
@@ -289,7 +286,8 @@ testme_run_test <- function(testme) {
   if (testme[["status"]] != "skipped") {
     if (testme[["debug"]]) message("Running test script: ", sQuote(testme[["script"]]))
     testme[["status"]] <- "failed"
-    if (testme[["covr"]] != "none") {
+    str(testme[["coverage"]])
+    if (testme[["coverage"]] != "none") {
       pkg_env <- pkgload::load_all()
       cov <- covr::environment_coverage(pkg_env[["env"]], test_files = testme[["script"]])
       ## Keep source files with non-zero coverage
@@ -345,11 +343,11 @@ testme_run_test <- function(testme) {
     message("Source files covered by the test script:")
     if (length(cov) > 0) {
       print(cov)
-      if ("tally" %in% testme[["covr"]]) {
+      if ("tally" %in% testme[["coverage"]]) {
         tally <- covr::tally_coverage(cov)
         print(tally)
       }
-      if ("report" %in% testme[["covr"]]) {
+      if ("report" %in% testme[["coverage"]]) {
         html <- covr::report(cov, browse = FALSE)
         browseURL(html)
         Sys.sleep(5.0)

tests/test-makeClusterSequential.R

@@ -0,0 +1,4 @@
+#! /usr/bin/env Rscript
+## This runs testme test script inst/testme/test-makeClusterSequential.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+future:::testme("makeClusterSequential")