From 6c154783b4651239e170b207df2706692917b022 Mon Sep 17 00:00:00 2001 From: Jeb Bearer Date: Tue, 13 Aug 2024 08:25:06 -0700 Subject: [PATCH] Avoid blocking drop at end of restart tests --- sequencer/src/restart_tests.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sequencer/src/restart_tests.rs b/sequencer/src/restart_tests.rs index 8223bcdbac..e0b5dd593e 100644 --- a/sequencer/src/restart_tests.rs +++ b/sequencer/src/restart_tests.rs @@ -46,6 +46,8 @@ async fn test_restart_helper(network: (usize, usize), restart: (usize, usize), c network.check_progress().await; // Restart some combination of nodes and ensure progress resumes. network.restart(restart.0, restart.1).await; + + network.shut_down().await; } #[async_std::test] @@ -594,6 +596,17 @@ impl TestNetwork { self.check_progress().await; } + async fn shut_down(mut self) { + tracing::info!("shutting down test network"); + join_all( + self.da_nodes + .iter_mut() + .map(TestNode::stop) + .chain(self.regular_nodes.iter_mut().map(TestNode::stop)), + ) + .await; + } + fn num_nodes(&self) -> usize { self.da_nodes.len() + self.regular_nodes.len() }