!squash pytest fixture

Author: tony

src/libtmux/pytest_plugin.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import contextlib
+import functools
 import getpass
 import logging
 import os
@@ -258,7 +259,8 @@ def session(
     return session
 
 
-def TempServer(socket_name: str | None = None, **kwargs: t.Any) -> Server:
+@pytest.fixture
+def TempServer(request: pytest.FixtureRequest) -> Server:
     """Create a temporary tmux server that cleans up after itself.
 
     This is similar to the server pytest fixture, but can be used outside of pytest.
@@ -285,15 +287,16 @@ def TempServer(socket_name: str | None = None, **kwargs: t.Any) -> Server:
     True
     >>> del server  # Server is automatically killed
     """
-    if socket_name is None:
-        socket_name = f"libtmux_test{next(namer)}"
+    socket_name = f"libtmux_test{next(namer)}"
 
-    server = Server(socket_name=socket_name, **kwargs)
+    Server_ = functools.partial(Server, socket_name=socket_name)
 
     def fin() -> None:
         """Kill server if it exists."""
+        server = Server(socket_name=socket_name)
         if server.is_alive():
             server.kill()
 
-    server.__del__ = fin  # type: ignore
-    return server
+    request.addfinalizer(fin)
+
+    return Server_