From 92b8831ebbfe8bbfa7c33feec6f2bdfb5c26c5e7 Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Wed, 15 Nov 2023 22:57:22 +1100
Subject: [PATCH] Fix running tests in `pidfd_reaper`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 tokio/src/process/unix/pidfd_reaper.rs | 52 +++++++++++++++++---------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/tokio/src/process/unix/pidfd_reaper.rs b/tokio/src/process/unix/pidfd_reaper.rs
index 4254cb341a2..e12c6723172 100644
--- a/tokio/src/process/unix/pidfd_reaper.rs
+++ b/tokio/src/process/unix/pidfd_reaper.rs
@@ -176,31 +176,49 @@ where
 #[cfg(all(test, not(loom)))]
 mod test {
     use super::*;
+    use crate::runtime::{Builder as RuntimeBuilder, Runtime};
     use std::process::Command;
 
-    #[crate::test]
-    async fn test_pidfd_reaper_poll() {
-        let child = Command::new("true").spawn().unwrap();
-        let mut pidfd_reaper = PidfdReaper::new(child).unwrap();
+    fn create_runtime() -> Runtime {
+        RuntimeBuilder::new_current_thread()
+            .enable_io()
+            .build()
+            .unwrap()
+    }
 
-        let exit_status = pidfd_reaper.await.unwrap();
-        assert!(exit_status.success());
+    fn run_test(fut: impl Future<Output = ()>) {
+        create_runtime().block_on(fut)
     }
 
-    #[crate::test]
-    async fn test_pidfd_reaper_kill() {
-        let child = Command::new("sleep").arg("1800").spawn().unwrap();
-        let mut pidfd_reaper = PidfdReaper::new(child).unwrap();
+    #[test]
+    fn test_pidfd_reaper_poll() {
+        run_test(async {
+            let child = Command::new("true").spawn().unwrap();
+            let pidfd_reaper = PidfdReaper::new(child).unwrap();
+
+            let exit_status = pidfd_reaper.await.unwrap();
+            assert!(exit_status.success());
+        });
+    }
 
-        pidfd_reaper.kill().unwrap();
+    #[test]
+    fn test_pidfd_reaper_kill() {
+        run_test(async {
+            let child = Command::new("sleep").arg("1800").spawn().unwrap();
+            let mut pidfd_reaper = PidfdReaper::new(child).unwrap();
 
-        let exit_status = pidfd_reaper.await.unwrap();
-        assert!(!exit_status.success());
+            pidfd_reaper.kill().unwrap();
+
+            let exit_status = pidfd_reaper.await.unwrap();
+            assert!(!exit_status.success());
+        });
     }
 
-    #[crate::test]
-    async fn test_pidfd_reaper_drop() {
-        let child = Command::new("true").spawn().unwrap();
-        let mut pidfd_reaper = PidfdReaper::new(child).unwrap();
+    #[test]
+    fn test_pidfd_reaper_drop() {
+        run_test(async {
+            let child = Command::new("true").spawn().unwrap();
+            let _pidfd_reaper = PidfdReaper::new(child).unwrap();
+        });
     }
 }