remove tokio from unit tests

1 files changed, 39 insertions, 59 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 0b1ab375..cca5ec95 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -333,16 +333,8 @@ mod test {
         ConnectionID,
         server::{Server, ServerConfig},
     };
-    use std::future::Future;
     use tokio::sync::broadcast;
 
-    fn harness(body: impl Future) {
-        tokio::runtime::Builder::new_current_thread()
-            .enable_all()
-            .build()
-            .unwrap()
-            .block_on(body);
-    }
     fn server() -> Server {
         Server::new(
             "../data".into(),
@@ -354,76 +346,64 @@ mod test {
 
     #[test]
     fn init_server() {
-        harness(async {
-            server();
-        });
+        server();
     }
     #[test]
     fn full_game() {
-        harness(async {
-            let mut s = server();
-            s.load(s.index.generate_with_book("junior").unwrap(), None);
-            while s.tick(0.1).is_none() {}
-        });
+        let mut s = server();
+        s.load(s.index.generate_with_book("junior").unwrap(), None);
+        while s.tick(0.1).is_none() {}
     }
 
     #[test]
     fn map_load() {
-        harness(async {
-            let mut s = server();
-            s.load(s.index.generate("5star").unwrap(), None);
-        });
+        let mut s = server();
+        s.load(s.index.generate("5star").unwrap(), None);
     }
     #[test]
     fn map_load_book() {
-        harness(async {
-            let mut s = server();
-            s.load(s.index.generate_with_book("lobby").unwrap(), None);
-        });
+        let mut s = server();
+        s.load(s.index.generate_with_book("lobby").unwrap(), None);
     }
     #[test]
     fn tick() {
-        harness(async {
-            let mut s = server();
-            for _ in 0..100 {
-                s.tick(0.1);
-            }
-        });
+        let mut s = server();
+        for _ in 0..100 {
+            s.tick(0.1);
+        }
     }
     #[test]
     fn packet_sender_verif() {
-        harness(async {
-            let mut s = server();
+        let mut s = server();
 
-            for (conn, p) in [
-                PacketS::Effect {
-                    player: PlayerID(0),
-                    name: "test".to_owned(),
-                },
-                PacketS::Leave {
-                    player: PlayerID(0),
+        for (conn, p) in [
+            PacketS::Effect {
+                player: PlayerID(0),
+                name: "test".to_owned(),
+            },
+            PacketS::Leave {
+                player: PlayerID(0),
+            },
+            PacketS::ReplayTick { dt: 1. },
+        ]
+        .into_iter()
+        .enumerate()
+        {
+            s.packet_in_outer(
+                ConnectionID(conn.try_into().unwrap()),
+                PacketS::Join {
+                    name: format!("test {conn}"),
+                    character: Character::default(),
+                    class: PlayerClass::Chef,
+                    id: None,
+                    position: None,
                 },
-                PacketS::ReplayTick { dt: 1. },
-            ]
-            .into_iter()
-            .enumerate()
-            {
-                s.packet_in_outer(
-                    ConnectionID(conn.try_into().unwrap()),
-                    PacketS::Join {
-                        name: format!("test {conn}"),
-                        character: Character::default(),
-                        class: PlayerClass::Chef,
-                        id: None,
-                        position: None,
-                    },
-                )
-                .unwrap();
+            )
+            .unwrap();
 
-                let x = s.packet_in_outer(ConnectionID(conn.try_into().unwrap()), p);
-                assert!(x.is_ok(), "test {} {:?}", conn, x)
-            }
-        });
+            let x = s.packet_in_outer(ConnectionID(conn.try_into().unwrap()), p);
+            assert!(x.is_ok(), "test {} {:?}", conn, x)
+        }
     }
 }