add timeout after kill for test setup (#52)

* add timeout after kill

* Auto Format Changes

* clippy

---------

Co-authored-by: Format Bot <>

src/info.rs

@@ -298,7 +298,7 @@ mod tests {
     #[tokio::test]
     #[serial]
     async fn test_shard_attachment() {
-        crate::integration::test_setup::setup_test();
+        crate::integration::test_setup::setup_test().await;
 
         let test_router_client = TestRouterClient::new();
         let test_client = test_router_client.get_client();
@@ -416,5 +416,7 @@ mod tests {
             client_shard_info_responses[0].read_shard_info.len(),
             write_shards as usize
         );
+
+        crate::integration::test_setup::test_teardown().await;
     }
 }

src/integration/test.rs

@@ -20,7 +20,7 @@ mod tests {
     #[serial]
     async fn test_basic_integration() -> Result<()> {
         let r: Result<()> = {
-            test_setup::setup_test();
+            test_setup::setup_test().await;
 
             // start everything
             let mut info_cmd = Command::cargo_bin("info")?;
@@ -61,7 +61,7 @@ mod tests {
             Ok(())
         };
 
-        test_setup::test_teardown();
+        test_setup::test_teardown().await;
         r
     }
 

src/integration/test_setup.rs

@@ -1,6 +1,7 @@
 // kill any dangling info shard processes for test setup
+
 #[cfg(test)]
-pub fn setup_test() {
+async fn kill_dangling() {
     let system = sysinfo::System::new_all();
 
     let ps = system.processes().iter().filter(|(_, p)| {
@@ -13,22 +14,14 @@ pub fn setup_test() {
     for (_, process) in ps {
         process.kill();
     }
+    tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 }
-
 #[cfg(test)]
-pub fn test_teardown() {
-    let system = sysinfo::System::new_all();
-
-    let ps = system.processes().iter().filter(|(_, p)| {
-        p.name().to_str().unwrap().eq("info")
-            || p.name().to_str().unwrap().eq("read_shard")
-            || p.name().to_str().unwrap().eq("write_shard")
-            || p.name().to_str().unwrap().eq("client")
-    });
+pub async fn setup_test() {
+    kill_dangling().await
+}
 
-    for (_pid, process) in ps {
-        let name = process.name().to_str().unwrap();
-        println!("killing {name}");
-        process.kill();
-    }
+#[cfg(test)]
+pub async fn test_teardown() {
+    kill_dangling().await
 }

src/io/router_example.rs

@@ -106,7 +106,7 @@ mod test {
     #[tokio::test]
     #[serial]
     async fn test_example_router() -> Result<()> {
-        test_setup::setup_test();
+        test_setup::setup_test().await;
 
         let debug_out1: Arc<RwLock<Vec<Vec<u8>>>> = Arc::new(RwLock::new(Vec::new()));
         let debug_out2: Arc<RwLock<Vec<Vec<u8>>>> = Arc::new(RwLock::new(Vec::new()));
@@ -151,6 +151,8 @@ mod test {
             *debug_out1,
             vec![vec![1, 2, 3, 4], vec![1, 2, 3, 4], vec![1, 2, 3, 4]]
         );
+
+        test_setup::test_teardown().await;
         Ok(())
     }
 }