fix: partial matches

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

@@ -327,7 +327,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

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)

tests/testthat/test-Rush.R

@@ -1,7 +1,7 @@
 # start workers with processx --------------------------------------------------
 
 test_that("constructing a rush controller works", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -12,15 +12,15 @@ test_that("constructing a rush controller works", {
 })
 
 test_that("workers are started", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
   fun = function(x1, x2, ...) list(y = x1 + x2)
 
   expect_data_table(rush$worker_info, nrows = 0)
 
-  worker_ids = rush$start_workers(fun = fun, n_workers = 2, lgr_threshold = c(rush = "debug"), wait_for_workers = TRUE)
+  worker_ids = rush$start_workers(fun = fun, n_workers = 2, lgr_thresholds = c(rush = "debug"), wait_for_workers = TRUE)
   expect_equal(rush$n_workers, 2)
 
   # check fields
@@ -39,7 +39,7 @@ test_that("workers are started", {
 })
 
 test_that("workers are started with a heartbeat", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -55,7 +55,7 @@ test_that("workers are started with a heartbeat", {
 })
 
 test_that("additional workers are started", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -81,7 +81,7 @@ test_that("additional workers are started", {
 })
 
 test_that("packages are available on the worker", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -99,7 +99,7 @@ test_that("packages are available on the worker", {
 })
 
 test_that("globals are available on the worker", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -119,7 +119,7 @@ test_that("globals are available on the worker", {
 })
 
 test_that("named globals are available on the worker", {
-
+  skip_on_cran()
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -141,16 +141,16 @@ test_that("named globals are available on the worker", {
 # start workers with script ----------------------------------------------------
 
 test_that("worker can be started with script", {
-
-  skip_if(TRUE)
+  skip_on_cran()
+  #devskip_if(TRUE)
   set.seed(1) # make log messages reproducible
 
   root_logger = lgr::get_logger("root")
   old_fmt = root_logger$appenders$cons$layout$fmt
   root_logger$appenders$cons$layout$set_fmt("%L (%n): %m")
 
   on.exit({
-    root_logger$appenders$cons$layout$set_fmt(old_fmt)
+    root_logger$appenders$console$layout$set_fmt(old_fmt)
   })
 
   config = start_flush_redis()
@@ -239,7 +239,6 @@ test_that("a local worker is killed", {
 })
 
 test_that("a remote worker is killed via the heartbeat", {
-
   skip_on_os("windows")
 
   config = start_flush_redis()
@@ -740,8 +739,7 @@ test_that("restarting a worker works", {
 })
 
 test_that("restarting a worker kills the worker", {
-
-  skip_on_windows()
+  skip_on_os("windows")
 
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
@@ -753,6 +751,9 @@ test_that("restarting a worker kills the worker", {
   expect_true(tools::pskill(pid, signal = 0))
 
   rush$restart_workers(worker_ids = worker_id)
+
+  Sys.sleep(1)
+
   expect_false(pid == rush$worker_info$pid)
   expect_false(tools::pskill(pid, signal = 0))
 
@@ -855,8 +856,6 @@ test_that("snapshot option works", {
 })
 
 test_that("terminating workers on idle works", {
-
-
   config = start_flush_redis()
   rush = Rush$new(network_id = "test-rush", config = config)
   fun = function(x1, x2, ...) list(y = x1 + x2)
@@ -982,6 +981,10 @@ test_that("seed is set correctly on two workers", {
 # log --------------------------------------------------------------------------
 
 test_that("printing logs with redis appender works", {
+  lg_rush = lgr::get_logger("rush")
+  old_threshold_rush = lg_rush$threshold
+  on.exit(lg_rush$set_threshold(old_threshold_rush))
+  lg_rush$set_threshold("info")
 
   skip_if(TRUE) # does not work in testthat on environment