Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions R/parallel.R
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ queue_teardown <- function(queue) {

clean_fn <- function() {
withr::deferred_run(.GlobalEnv)
quit(save = "no", status = 1L, runLast = TRUE)
quit(save = "no", status = 0L, runLast = TRUE)
}

topoll <- list()
Expand All @@ -327,7 +327,7 @@ queue_teardown <- function(queue) {
tryCatch(
{
tasks$worker[[i]]$call(clean_fn)
topoll <- c(topoll, tasks$worker[[i]]$get_poll_connection())
topoll <- c(topoll, tasks$worker[[i]])
},
error = function(e) tasks$worker[i] <- list(NULL)
)
Expand All @@ -340,10 +340,16 @@ queue_teardown <- function(queue) {
} else {
grace <- 3L
}
first_error <- NULL
limit <- Sys.time() + grace
while (length(topoll) > 0 && (timeout <- limit - Sys.time()) > 0) {
timeout <- as.double(timeout, units = "secs") * 1000
pr <- processx::poll(topoll, as.integer(timeout))
conns <- lapply(topoll, function(x) x$get_poll_connection())
pr <- unlist(processx::poll(conns, as.integer(timeout)))
for (i in which(pr == "ready")) {
msg <- topoll[[i]]$read()
first_error <- first_error %||% msg$error
}
topoll <- topoll[pr != "ready"]
}

Expand All @@ -360,6 +366,13 @@ queue_teardown <- function(queue) {
}
}
}

if (!is.null(first_error)) {
cli::cli_abort(
"At least one parallel worker failed to run teardown",
parent = first_error
)
}
}

# Reporter that just forwards events in the subprocess back to the main process
Expand Down
13 changes: 10 additions & 3 deletions tests/testthat/test-parallel-teardown.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
test_that("teardown error", {
skip("teardown errors are ignored")
withr::local_envvar(TESTTHAT_PARALLEL = "TRUE")
err <- tryCatch(
capture.output(suppressMessages(testthat::test_local(
Expand All @@ -8,6 +7,14 @@ test_that("teardown error", {
))),
error = function(e) e
)
expect_s3_class(err, "testthat_process_error")
expect_match(err$message, "Error in teardown", fixed = TRUE)
expect_s3_class(err$parent, "callr_error")
expect_match(
err$message,
"At least one parallel worker failed to run teardown"
)
expect_match(
err$parent$parent$parent$message,
"Error in teardown",
fixed = TRUE
)
})
Loading