definitely kill server in tests

mcserver-tools · Oct 6, 2024 · 8e27a83 · 8e27a83
1 parent 9ca4766
commit 8e27a83
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/mcserverwrapper/src/server/base_server.py b/mcserverwrapper/src/server/base_server.py
@@ -51,7 +51,7 @@ def start(self, blocking=True):
             self._wait_for_startup()
 
     def stop(self):
-        """Stop the running server gracefully, and kills it if it doesn't stop within 20 seconds"""
+        """Stop the running server gracefully"""
 
         # server hasn't yet started, so it doesn't need to be stopped
         if self._child is None:

diff --git a/mcserverwrapper/test/helpers/forge_helper.py b/mcserverwrapper/test/helpers/forge_helper.py
@@ -85,7 +85,7 @@ def run_forge_test(jarfile, offline_mode=False):
     while "Hello World" not in line:
         line = wrapper.output_queue.get(timeout=10)
 
-    wrapper.stop()
+    wrapper.server.kill()
 
     assert not wrapper.server_running()
     # assert that the server process really stopped

diff --git a/mcserverwrapper/test/helpers/vanilla_helper.py b/mcserverwrapper/test/helpers/vanilla_helper.py
@@ -74,7 +74,7 @@ def run_vanilla_test(jarfile, offline_mode=False):
         while "I spawned" not in line:
             line = wrapper.output_queue.get(timeout=5)
 
-    wrapper.stop()
+    wrapper.server.kill()
 
     assert not wrapper.server_running()
     # assert that the server process really stopped

diff --git a/mcserverwrapper/test/integration_tests/test_vanilla.py b/mcserverwrapper/test/integration_tests/test_vanilla.py
@@ -111,7 +111,7 @@ def _test_mineflayer(newest_server_jar):
     while "I spawned" not in line:
         line = wrapper.output_queue.get(timeout=5)
 
-    wrapper.stop()
+    wrapper.server.kill()
 
     # assert that the server process really stopped
     assert wrapper.server.get_child_status(0.1) is not None