!squash test_server cleanup

Author: tony

tests/test_server.py

@@ -238,8 +238,12 @@ def on_init(server: Server) -> None:
         called_with.append(server)
 
     myserver = Server(socket_name="test_on_init", on_init=on_init)
-    assert len(called_with) == 1
-    assert called_with[0] is myserver
+    try:
+        assert len(called_with) == 1
+        assert called_with[0] is myserver
+    finally:
+        if myserver.is_alive():
+            myserver.kill()
 
 
 def test_socket_name_factory(server: Server) -> None:
@@ -252,13 +256,23 @@ def socket_name_factory() -> str:
         return name
 
     myserver = Server(socket_name_factory=socket_name_factory)
-    assert myserver.socket_name == "test_socket_0"
-    assert socket_names == ["test_socket_0"]
-
-    # Creating another server should use factory again
-    myserver2 = Server(socket_name_factory=socket_name_factory)
-    assert myserver2.socket_name == "test_socket_1"
-    assert socket_names == ["test_socket_0", "test_socket_1"]
+    try:
+        assert myserver.socket_name == "test_socket_0"
+        assert socket_names == ["test_socket_0"]
+
+        # Creating another server should use factory again
+        myserver2 = Server(socket_name_factory=socket_name_factory)
+        try:
+            assert myserver2.socket_name == "test_socket_1"
+            assert socket_names == ["test_socket_0", "test_socket_1"]
+        finally:
+            if myserver2.is_alive():
+                myserver2.kill()
+    finally:
+        if myserver.is_alive():
+            myserver.kill()
+        if myserver2.is_alive():
+            myserver2.kill()
 
 
 def test_socket_name_precedence(server: Server) -> None:
@@ -271,8 +285,14 @@ def socket_name_factory() -> str:
         socket_name="explicit_name",
         socket_name_factory=socket_name_factory,
     )
-    assert myserver.socket_name == "explicit_name"
-
-    # Without socket_name, factory is used
     myserver2 = Server(socket_name_factory=socket_name_factory)
-    assert myserver2.socket_name == "from_factory"
+    try:
+        assert myserver.socket_name == "explicit_name"
+
+        # Without socket_name, factory is used
+        assert myserver2.socket_name == "from_factory"
+    finally:
+        if myserver.is_alive():
+            myserver.kill()
+        if myserver2.is_alive():
+            myserver2.kill()