Merge pull request #27 from artemijan/fixes

Cleanup+ fix randomly failing tests because of `reset_for_tests` caus…

Author: artemijan

Cargo.lock

@@ -59,4 +59,4 @@ uuid = { version = "^1.17.0", features = ["v4"] }
 strum = { version = "0.27.2", features = ["derive"] }
 async-std = { version = "1.13.1", features = ["attributes", "tokio1"] }
 bytes = "1.10.1"
-ntest = "0.9.3"
+serial_test = "3.2.0"

Cargo.toml

@@ -26,9 +26,7 @@ kameo.workspace = true
 bytes.workspace = true
 dotenvy.workspace = true
 [dev-dependencies]
-ntest.workspace = true
 test-utils = { path = "../test-utils" }
 entities = { path = "../entities", features = ["test-factories"] }
-
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }

game/Cargo.toml

@@ -1,5 +1,5 @@
 use crate::packets::to_client::{CharSelectionInfo, DeleteObject, RestartResponse};
-use crate::pl_client::PlayerClient;
+use crate::pl_client::{ClientStatus, PlayerClient};
 use bytes::BytesMut;
 use entities::entities::character;
 use kameo::message::Context;
@@ -28,12 +28,12 @@ impl Message<RequestRestart> for PlayerClient {
         _ctx: &mut Context<Self, Self::Reply>,
     ) -> anyhow::Result<()> {
         //todo: if can logout (olymp, pvp flag, events, etc.)
-        self.stop_movement();
         let session_id = self.try_get_session_key()?.get_play_session_id();
         let chars = self.try_get_account_chars()?;
         let user_name = self.try_get_user()?.username.clone();
         let p = CharSelectionInfo::new(&user_name.clone(), session_id, &self.controller, chars)?;
         let player = self.try_get_selected_char()?.clone(); // we clone it to avoid borrow checker issues with reference to self
+        self.set_status(ClientStatus::Authenticated);
         self.controller.broadcast_packet_with_filter(
             DeleteObject::new(player.get_object_id())?,
             Some(Box::new(move |acc, _| !acc.eq(&user_name))),

game/src/packets/from_client/restart.rs

@@ -45,7 +45,6 @@ mod tests {
     use crate::test_utils::test::spawn_ls_client_actor;
     use l2_core::config::gs::GSServerConfig;
     use l2_core::traits::ServerConfig;
-    use ntest::timeout;
     use std::sync::Arc;
     use test_utils::utils::get_test_db;
     use tokio::io::{split, AsyncReadExt};

game/src/packets/handleable/gs_auth_response.rs

@@ -38,7 +38,6 @@ mod tests {
     use l2_core::config::gs::GSServerConfig;
     use l2_core::crypt::rsa::ScrambledRSAKeyPair;
     use l2_core::traits::ServerConfig;
-    use ntest::timeout;
     use std::sync::Arc;
     use test_utils::utils::get_test_db;
     use tokio::io::{split, AsyncReadExt};

game/src/packets/handleable/init_ls.rs

@@ -338,6 +338,9 @@ impl PlayerClient {
         dest_z: i32,
         actor_ref: ActorRef<PlayerClient>,
     ) -> anyhow::Result<(i32, i32, i32)> {
+        if self.status != ClientStatus::InGame {
+            bail!("Can't start movement. PlayerClient is not in game");
+        }
         // Compute effective current position consistent with validation logic
         let (current_x, current_y, current_z) = self.effective_current_position()?;
 
@@ -363,7 +366,7 @@ impl PlayerClient {
         let controller = self.controller.clone();
 
         let task_handle = tokio::spawn(async move {
-            let mut interval = tokio::time::interval(std::time::Duration::from_millis(300));
+            let mut interval = tokio::time::interval(Duration::from_millis(300));
 
             loop {
                 // Check movement state BEFORE waiting
@@ -388,7 +391,7 @@ impl PlayerClient {
                         error!("Error while broadcasting movement packet");
                     }
                 } else {
-                    // Error or no movement state, stop a task
+                    // Error or no movement state, or movement is not allowed, stop a task
                     break;
                 }
 
@@ -588,6 +591,10 @@ impl Message<GetMovementPosition> for PlayerClient {
         _: GetMovementPosition,
         _ctx: &mut Context<Self, Self::Reply>,
     ) -> Self::Reply {
+        if self.status != ClientStatus::InGame {
+            self.stop_movement();
+            bail!("Can't get movement position. PlayerClient is not in game");
+        }
         if let Some(movement) = self.movement_state.as_ref() {
             let (x, y, z) = movement.calculate_current_position();
             let has_arrived = movement.has_arrived();

game/src/pl_client.rs

@@ -42,4 +42,5 @@ serde_json.workspace = true
 kameo.workspace = true
 
 [dev-dependencies]
-test-utils = { path = "../test-utils" }
+test-utils = { path = "../test-utils" }
+serial_test.workspace = true

l2-core/Cargo.toml

@@ -106,6 +106,7 @@ mod tests {
     }
 
     #[test]
+    #[serial_test::serial]
     fn test_allocation() {
         let factory = IdFactory::instance();
         factory.reset_for_tests();
@@ -116,6 +117,7 @@ mod tests {
     }
 
     #[test]
+    #[serial_test::serial]
     fn test_reuse() {
         let factory = IdFactory::instance();
         factory.reset_for_tests();

l2-core/src/id_factory.rs

@@ -22,7 +22,6 @@ pnet.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 sea-orm.workspace = true
-ntest.workspace = true
 kameo.workspace = true
 dotenvy.workspace = true
 bytes.workspace = true