!squash more

Author: tony

src/libtmux/pytest_plugin.py

@@ -260,43 +260,47 @@ def session(
 
 
 @pytest.fixture
-def TempServer(request: pytest.FixtureRequest) -> Server:
+def TempServer(
+    request: pytest.FixtureRequest,
+) -> t.Callable[[], t.Callable[..., 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 object is garbage collected.
-
-    Parameters
-    ----------
-    socket_name : str, optional
-        Name for the tmux socket. If not provided, a random one will be generated.
-    **kwargs : dict
-        Additional arguments to pass to Server constructor
+    The server will be killed when the test completes.
 
     Returns
     -------
-    Server
-        A Server instance that will clean up after itself
+    Callable[[], Callable[..., Server]]
+        A factory function that returns a partial'd Server with a unique socket_name
 
     Examples
     --------
-    >>> server = TempServer()
+    >>> Server = request.getfixturevalue('TempServer')()  # Get unique partial
+    >>> server = Server()  # Create server instance
     >>> server.new_session()
     Session($... ...)
     >>> server.is_alive()
     True
-    >>> del server  # Server is automatically killed
+    >>> # Each call to TempServer() gets a new unique partial
+    >>> Server2 = request.getfixturevalue('TempServer')()
+    >>> server2 = Server2()
+    >>> server2.socket_name != server.socket_name
+    True
     """
-    socket_name = f"libtmux_test{next(namer)}"
+    created_sockets: list[str] = []
 
-    Server_ = functools.partial(Server, socket_name=socket_name)
+    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 fin() -> None:
-        """Kill server if it exists."""
-        server = Server(socket_name=socket_name)
-        if server.is_alive():
-            server.kill()
+        """Kill all servers created with these sockets."""
+        for socket_name in created_sockets:
+            server = Server(socket_name=socket_name)
+            if server.is_alive():
+                server.kill()
 
     request.addfinalizer(fin)
 
-    return Server_
+    return get_server

tests/test_pytest_plugin.py

@@ -75,48 +75,39 @@ def test_repo_git_remote_checkout(
     result.assert_outcomes(passed=1)
 
 
-def test_temp_server() -> None:
+def test_temp_server(TempServer: t.Any) -> None:
     """Test TempServer creates and cleans up server."""
-    from libtmux.pytest_plugin import TempServer
-
-    server = TempServer()
+    Server = TempServer()  # Get partial'd Server
+    server = Server()  # Create server instance
     assert server.is_alive() is False  # Server not started yet
 
     session = server.new_session()
     assert server.is_alive() is True
     assert len(server.sessions) == 1
     assert session.session_name is not None
 
-    # Test custom socket name
-    custom_server = TempServer(socket_name="test_custom")
-    assert custom_server.socket_name == "test_custom"
-
-    # Test cleanup
-    del server
-    del custom_server
+    # Test socket name is unique
+    assert server.socket_name is not None
+    assert server.socket_name.startswith("libtmux_test")
 
 
-def test_temp_server_with_config(tmp_path: pathlib.Path) -> None:
+def test_temp_server_with_config(TempServer: t.Any, tmp_path: pathlib.Path) -> None:
     """Test TempServer with custom config."""
-    from libtmux.pytest_plugin import TempServer
-
     config_file = tmp_path / "tmux.conf"
     config_file.write_text("set -g status off", encoding="utf-8")
 
-    server = TempServer(config_file=str(config_file))
+    Server = TempServer()  # Get partial'd Server
+    server = Server(config_file=str(config_file))  # Create server with config
     session = server.new_session()
 
     # Verify config was loaded by checking status
     assert session.cmd("show-options", "-g", "status").stdout[0] == "status off"
 
-    del server
 
-
-def test_temp_server_cleanup() -> None:
+def test_temp_server_cleanup(TempServer: t.Any) -> None:
     """Test TempServer properly cleans up after itself."""
-    from libtmux.pytest_plugin import TempServer
-
-    server = TempServer()
+    Server = TempServer()  # Get partial'd Server
+    server = Server()  # Create server instance
     socket_name = server.socket_name
     assert socket_name is not None
 
@@ -130,23 +121,23 @@ def test_temp_server_cleanup() -> None:
 
     # Delete server and verify cleanup
     server.kill()
-    del server
     time.sleep(0.1)  # Give time for cleanup
 
-    # Create new server with same socket name to verify old one was cleaned up
-    new_server = TempServer(socket_name=socket_name)
+    # Create new server to verify old one was cleaned up
+    Server2 = TempServer()  # Get new partial'd Server
+    new_server = Server2()  # Create new server instance
     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
-    del new_server
 
 
-def test_temp_server_multiple() -> None:
+def test_temp_server_multiple(TempServer: t.Any) -> None:
     """Test multiple TempServer instances can coexist."""
-    from libtmux.pytest_plugin import TempServer
+    Server1 = TempServer()  # Get first partial'd Server
+    Server2 = TempServer()  # Get second partial'd Server
 
-    server1 = TempServer()
-    server2 = TempServer()
+    server1 = Server1()  # Create first server instance
+    server2 = Server2()  # Create second server instance
 
     # Each server should have a unique socket
     assert server1.socket_name != server2.socket_name
@@ -160,6 +151,3 @@ def test_temp_server_multiple() -> None:
     assert any(s.session_name == "test2" for s in server2.sessions)
     assert not any(s.session_name == "test1" for s in server2.sessions)
     assert not any(s.session_name == "test2" for s in server1.sessions)
-
-    del server1
-    del server2