summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2021-09-08 11:18:07 -0400
committerGitHub <noreply@github.com>2021-09-08 11:18:07 -0400
commit2958b05d0c365a6705f506b332643e4d92e1ff9d (patch)
tree576107e4e192ff3e8b6b80ce4cdb389f19494dd2
parent5db1c401cd675c6a237098c216945738f62cea2b (diff)
fix(test): propagate join errors in deno test (#11953)
-rw-r--r--cli/tools/test.rs24
1 files changed, 4 insertions, 20 deletions
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index dc1cd643f..ec16d6fb0 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(())
}