From 2958b05d0c365a6705f506b332643e4d92e1ff9d Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 8 Sep 2021 11:18:07 -0400 Subject: [PATCH] fix(test): propagate join errors in deno test (#11953) --- cli/tools/test.rs | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/cli/tools/test.rs b/cli/tools/test.rs index dc1cd643f3..ec16d6fb0c 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -715,28 +715,12 @@ async fn test_specifiers( let (join_results, result) = future::join(join_stream, handler).await; - let mut join_errors = join_results.into_iter().filter_map(|join_result| { - join_result - .ok() - .map(|handle_result| handle_result.err()) - .flatten() - }); - - if let Some(e) = join_errors.next() { - return Err(e); + // propagate any errors + for join_result in join_results { + join_result??; } - match result { - Ok(result) => { - if let Some(err) = result.err() { - return Err(err); - } - } - - Err(err) => { - return Err(err.into()); - } - } + result??; Ok(()) }