don't use tokio::test for now

Author: syphar

src/db/overrides.rs

@@ -96,8 +96,8 @@ mod test {
     use crate::{db::Overrides, test::*};
     use std::time::Duration;
 
-    #[tokio::test]
-    async fn retrieve_overrides() {
+    #[test]
+    fn retrieve_overrides() {
         async_wrapper(|env| async move {
             let db = env.async_db().await;
             let mut conn = db.async_conn().await;
@@ -143,6 +143,5 @@ mod test {
 
             Ok(())
         })
-        .await;
     }
 }

src/docbuilder/limits.rs

@@ -73,8 +73,8 @@ mod test {
     use super::*;
     use crate::test::*;
 
-    #[tokio::test]
-    async fn retrieve_limits() {
+    #[test]
+    fn retrieve_limits() {
         async_wrapper(|env| async move {
             let db = env.async_db().await;
             let mut conn = db.async_conn().await;
@@ -129,11 +129,10 @@ mod test {
             );
             Ok(())
         })
-        .await;
     }
 
-    #[tokio::test]
-    async fn targets_default_to_one_with_timeout() {
+    #[test]
+    fn targets_default_to_one_with_timeout() {
         async_wrapper(|env| async move {
             let db = env.async_db().await;
             let mut conn = db.async_conn().await;
@@ -152,11 +151,10 @@ mod test {
 
             Ok(())
         })
-        .await;
     }
 
-    #[tokio::test]
-    async fn config_default_memory_limit() {
+    #[test]
+    fn config_default_memory_limit() {
         async_wrapper(|env| async move {
             env.override_config(|config| {
                 config.build_default_memory_limit = Some(6 * GB);
@@ -170,11 +168,10 @@ mod test {
 
             Ok(())
         })
-        .await;
     }
 
-    #[tokio::test]
-    async fn overrides_dont_lower_memory_limit() {
+    #[test]
+    fn overrides_dont_lower_memory_limit() {
         async_wrapper(|env| async move {
             let db = env.async_db().await;
             let mut conn = db.async_conn().await;
@@ -196,6 +193,5 @@ mod test {
 
             Ok(())
         })
-        .await;
     }
 }

src/test/mod.rs

@@ -56,7 +56,7 @@ pub(crate) fn wrapper(f: impl FnOnce(&TestEnvironment) -> Result<()>) {
     }
 }
 
-pub(crate) async fn async_wrapper<F, Fut>(f: F)
+pub(crate) fn async_wrapper<F, Fut>(f: F)
 where
     F: FnOnce(Rc<TestEnvironment>) -> Fut,
     Fut: Future<Output = Result<()>>,
@@ -65,13 +65,13 @@ where
 
     let fut = f(env.clone());
 
+    let runtime = env.runtime();
+
     // if we didn't catch the panic, the server would hang forever
-    let maybe_panic = panic::AssertUnwindSafe(fut).catch_unwind().await;
+    let maybe_panic = runtime.block_on(panic::AssertUnwindSafe(fut).catch_unwind());
 
     let env = Rc::into_inner(env).unwrap();
-    tokio::task::spawn_blocking(move || env.cleanup())
-        .await
-        .unwrap();
+    env.cleanup();
 
     let result = match maybe_panic {
         Ok(r) => r,