conditional logic

wlandau · Jan 28, 2025 · 2106267 · 2106267
1 parent 5fcdc3c
commit 2106267
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/R/crew_controller.R b/R/crew_controller.R
@@ -1297,13 +1297,20 @@ crew_class_controller <- R6::R6Class(
       summary$warning <- .subset2(summary, "warning") +
         !anyNA(.subset2(out, "warnings"))
       private$.summary <- summary
-      if (!is.null(error) && !anyNA(.subset2(out, "error"))) {
-        if (identical(error, "stop")) {
-          crew_error(message = .subset2(out, "error"))
-        } else if (identical(error, "warn")) {
-          crew_warning(message = .subset2(out, "error"))
-        }
-      }
+      has_error <- !is.null(error) &&
+        any(.subset2(out, "status") != "success")
+      throw_error <- has_error && identical(error, "stop")
+      throw_warning <- has_error && identical(error, "warn")
+      if_any(
+        throw_error,
+        crew_error(message = .subset2(out, "error")),
+        NULL
+      )
+      if_any(
+        throw_warning,
+        crew_warning(message = .subset2(out, "error")),
+        NULL
+      )
       out
     },
     #' @description Pop all available task results and return them in a tidy

diff --git a/tests/testthat/test-crew_controller.R b/tests/testthat/test-crew_controller.R
@@ -66,7 +66,7 @@ crew_test("can relay task errors as local errors", {
   })
   x$start()
   x$push(command =  stop("this is an error"), name = "warnings_and_errors")
-  x$wait(seconds_timeout = 5)
+  x$wait(seconds_timeout = 30)
   expect_silent(
     if_any(
       isTRUE(as.logical(Sys.getenv("R_COVR", "false"))),
@@ -95,7 +95,7 @@ crew_test("can relay task errors as local warnings", {
   })
   x$start()
   x$push(command =  stop("this is an error"), name = "warnings_and_errors")
-  x$wait(seconds_timeout = 5)
+  x$wait(seconds_timeout = 30)
   expect_silent(
     if_any(
       isTRUE(as.logical(Sys.getenv("R_COVR", "false"))),