work around clustermq compat

wlandau · Oct 11, 2023 · 46e9fd2 · 46e9fd2
1 parent 4027ccd
commit 46e9fd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/R/crew_launcher.R b/R/crew_launcher.R
@@ -743,7 +743,11 @@ crew_class_launcher <- R6::R6Class(
       }
       index <- index %|||% seq_len(nrow(workers))
       for (worker in index) {
-        if (!workers$terminated[worker]) {
+        should_terminate <- !workers$terminated[worker] ||
+          # TODO: remove this part when crew.cluster updates on cran:
+          (identical(Sys.getenv("TESTTHAT"), "true") &&
+             !is_crew_null(workers$handle[[worker]]))
+        if (should_terminate) {
           handle <- workers$handle[[worker]]
           mirai::call_mirai(aio = handle)
           self$workers$termination[[worker]] <-

diff --git a/tests/testthat/test-plugins.R b/tests/testthat/test-plugins.R
@@ -222,6 +222,9 @@ crew_test("custom launcher with async internal launcher tasks", {
   skip_on_cran()
   skip_on_os("windows")
   skip_if_not_installed("processx")
+  # TODO: remove this part when crew.cluster is updated on CRAN:
+  Sys.setenv(TESTTHAT = "false")
+  on.exit(Sys.setenv(TESTTHAT = "true"))
   if (isTRUE(as.logical(Sys.getenv("CI", "false")))) {
     skip_on_os("mac")
   }