From f20834c373aff675b43c5fc1114cdaff39061ab1 Mon Sep 17 00:00:00 2001 From: Arya Date: Thu, 15 Feb 2024 17:46:04 -0500 Subject: [PATCH] improve error message in non_blocking_logger test (#8276) --- zebrad/tests/acceptance.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index a5862a594..0aad78c4e 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -1691,13 +1691,11 @@ fn non_blocking_logger() -> Result<()> { Ok(()) }); - // Wait until the spawned task finishes or return an error in 45 seconds - if done_rx.recv_timeout(Duration::from_secs(45)).is_err() { - return Err(eyre!("unexpected test task hang")); + // Wait until the spawned task finishes up to 45 seconds before shutting down tokio runtime + if done_rx.recv_timeout(Duration::from_secs(45)).is_ok() { + rt.shutdown_timeout(Duration::from_secs(3)); } - rt.shutdown_timeout(Duration::from_secs(3)); - match test_task_handle.now_or_never() { Some(Ok(result)) => result, Some(Err(error)) => Err(eyre!("join error: {:?}", error)),