Merge branch 'main' of github.com:mlr-org/rush

.github/workflows/r-cmd-check.yml

@@ -57,3 +57,5 @@ jobs:
           limit-access-to-actor: true
 
       - uses: r-lib/actions/check-r-package@v2
+        with:
+          args: 'c("--no-manual")' # "--as-cran" prevents to start external processes

NAMESPACE

@@ -9,6 +9,7 @@ export(assert_rush_workers)
 export(assert_rushs)
 export(get_hostname)
 export(heartbeat)
+export(remove_rush_plan)
 export(rsh)
 export(rush_available)
 export(rush_config)

R/Rush.R

@@ -331,7 +331,7 @@ Rush = R6::R6Class("Rush",
     wait_for_workers = function(n, timeout = Inf) {
       assert_count(n)
       assert_number(timeout)
-      timeout = if (is.finite(timeout)) timeout else rush_config()$start_worker_timeout
+      timeout = if (is.finite(timeout)) timeout else rush_config()$start_worker_timeout %??% Inf
 
       start_time = Sys.time()
       while(self$n_workers < n) {

R/rush_plan.R

@@ -9,6 +9,8 @@
 #' If `NULL`, the `REDIS_URL` environment variable is parsed.
 #' If `REDIS_URL` is not set, a default configuration is used.
 #' See [redux::redis_config] for details.
+#' @param start_worker_timeout (`numeric(1)`)\cr
+#' The time in seconds to wait for a worker to start.
 #'
 #' @template param_n_workers
 #' @template param_lgr_thresholds
@@ -55,6 +57,17 @@ rush_config = function() {
     start_worker_timeout = rush_env$start_worker_timeout)
 }
 
+#' @title Remove Rush Plan
+#'
+#' @description
+#' Removes the rush plan that was set by [rush_plan()].
+#'
+#' @export
+remove_rush_plan = function() {
+  rm(list = ls(envir = rush_env), envir = rush_env)
+  invisible(NULL)
+}
+
 #' @title Rush Available
 #'
 #' @description

pkgdown/_pkgdown.yml

@@ -47,6 +47,7 @@ reference:
       - rush_plan
       - rush_available
       - rush_config
+      - remove_rush_plan
   - title: Worker Loop
     contents:
       - start_worker

tests/testthat/helper.R

@@ -12,10 +12,9 @@ expect_rush_task = function(task) {
 }
 
 expect_rush_reset = function(rush, type = "kill") {
+  remove_rush_plan()
   processes = rush$processes
   rush$reset(type = type)
   expect_list(rush$connector$command(c("KEYS", "*")), len = 0)
   walk(processes, function(p) p$kill())
 }
-
-lg$set_threshold("debug")

tests/testthat/setup.R

@@ -0,0 +1,13 @@
+old_opts = options(
+  warnPartialMatchArgs = TRUE,
+  warnPartialMatchAttr = TRUE,
+  warnPartialMatchDollar = TRUE
+)
+
+# https://github.com/HenrikBengtsson/Wishlist-for-R/issues/88
+old_opts = lapply(old_opts, function(x) if (is.null(x)) FALSE else x)
+
+lg_rush = lgr::get_logger("rush")
+old_threshold_rush = lg_rush$threshold
+lg_rush$set_threshold(0)
+

tests/testthat/teardown.R

@@ -0,0 +1,2 @@
+options(old_opts)
+lg_rush$set_threshold(old_threshold_rush)