!squash

Author: tony

src/libtmux/pytest_plugin.py

@@ -262,37 +262,38 @@ def session(
 @pytest.fixture
 def TempServer(
     request: pytest.FixtureRequest,
-) -> t.Callable[[], t.Callable[..., Server]]:
+) -> 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.
     The server will be killed when the test completes.
 
     Returns
     -------
-    Callable[[], Callable[..., Server]]
-        A factory function that returns a partial'd Server with a unique socket_name
+    Server
+        A factory function that returns a Server with a unique socket_name
 
     Examples
     --------
-    >>> Server = request.getfixturevalue('TempServer')()  # Get unique partial
     >>> server = Server()  # Create server instance
     >>> server.new_session()
     Session($... ...)
     >>> server.is_alive()
     True
-    >>> # Each call to TempServer() gets a new unique partial
-    >>> Server2 = request.getfixturevalue('TempServer')()
-    >>> server2 = Server2()
+    >>> # Each call creates a new server with unique socket
+    >>> server2 = Server()
     >>> server2.socket_name != server.socket_name
     True
     """
     created_sockets: list[str] = []
 
-    def get_server() -> t.Callable[..., Server]:
-        socket_name = f"libtmux_test{next(namer)}"
-        created_sockets.append(socket_name)
-        return functools.partial(Server, socket_name=socket_name)
+    def on_init(server: Server) -> None:
+        """Track created servers for cleanup."""
+        created_sockets.append(server.socket_name or "default")
+
+    def socket_name_factory() -> str:
+        """Generate unique socket names."""
+        return f"libtmux_test{next(namer)}"
 
     def fin() -> None:
         """Kill all servers created with these sockets."""
@@ -303,4 +304,11 @@ def fin() -> None:
 
     request.addfinalizer(fin)
 
-    return get_server
+    return t.cast(
+        "Server",
+        functools.partial(
+            Server,
+            on_init=on_init,
+            socket_name_factory=socket_name_factory,
+        ),
+    )

tests/test_pytest_plugin.py

@@ -11,6 +11,8 @@
 
     import pytest
 
+    from libtmux.server import Server
+
 
 def test_plugin(
     pytester: pytest.Pytester,
@@ -76,10 +78,9 @@ def test_repo_git_remote_checkout(
     result.assert_outcomes(passed=1)
 
 
-def test_temp_server(TempServer: t.Any) -> None:
+def test_temp_server(TempServer: t.Callable[..., Server]) -> None:
     """Test TempServer creates and cleans up server."""
-    Server = TempServer()  # Get partial'd Server
-    server = Server()  # Create server instance
+    server = TempServer()
     assert server.is_alive() is False  # Server not started yet
 
     session = server.new_session()
@@ -91,24 +92,31 @@ def test_temp_server(TempServer: t.Any) -> None:
     assert server.socket_name is not None
     assert server.socket_name.startswith("libtmux_test")
 
+    # Each call creates a new server with unique socket
+    server2 = TempServer()
+    assert server2.socket_name is not None
+    assert server2.socket_name.startswith("libtmux_test")
+    assert server2.socket_name != server.socket_name
+
 
-def test_temp_server_with_config(TempServer: t.Any, tmp_path: pathlib.Path) -> None:
-    """Test TempServer with custom config."""
+def test_temp_server_with_config(
+    TempServer: t.Callable[..., Server],
+    tmp_path: pathlib.Path,
+) -> None:
+    """Test TempServer with config file."""
     config_file = tmp_path / "tmux.conf"
     config_file.write_text("set -g status off", encoding="utf-8")
 
-    Server = TempServer()  # Get partial'd Server
-    server = Server(config_file=str(config_file))  # Create server with config
+    server = TempServer(config_file=str(config_file))
     session = server.new_session()
 
-    # Verify config was loaded by checking status
+    # Verify config was loaded
     assert session.cmd("show-options", "-g", "status").stdout[0] == "status off"
 
 
-def test_temp_server_cleanup(TempServer: t.Any) -> None:
+def test_temp_server_cleanup(TempServer: t.Callable[..., Server]) -> None:
     """Test TempServer properly cleans up after itself."""
-    Server = TempServer()  # Get partial'd Server
-    server = Server()  # Create server instance
+    server = TempServer()
     socket_name = server.socket_name
     assert socket_name is not None
 
@@ -125,20 +133,16 @@ def test_temp_server_cleanup(TempServer: t.Any) -> None:
     time.sleep(0.1)  # Give time for cleanup
 
     # Create new server to verify old one was cleaned up
-    Server2 = TempServer()  # Get new partial'd Server
-    new_server = Server2()  # Create new server instance
+    new_server = TempServer()
     assert new_server.is_alive() is False  # Server not started yet
     new_server.new_session()  # This should work if old server was cleaned up
     assert new_server.is_alive() is True
 
 
-def test_temp_server_multiple(TempServer: t.Any) -> None:
+def test_temp_server_multiple(TempServer: t.Callable[..., Server]) -> None:
     """Test multiple TempServer instances can coexist."""
-    Server1 = TempServer()  # Get first partial'd Server
-    Server2 = TempServer()  # Get second partial'd Server
-
-    server1 = Server1()  # Create first server instance
-    server2 = Server2()  # Create second server instance
+    server1 = TempServer()
+    server2 = TempServer()
 
     # Each server should have a unique socket
     assert server1.socket_name != server2.socket_name