!squash test_direct_testserver

Author: tony

tests/pytest_examples/test_direct_testserver.py

@@ -2,54 +2,68 @@
 
 from __future__ import annotations
 
+from typing import Any, Dict
+
 import pytest
+from _pytest.fixtures import FixtureRequest
 
+from libtmux import Server
 from libtmux.pytest_plugin import TestServer
 
 
 @pytest.fixture
-def custom_config(request):
-    """Fixture providing custom configuration settings."""
+def custom_config(request: FixtureRequest) -> Dict[str, Any]:
+    """Fixture providing custom configuration settings.
+    
+    Returns:
+        Dict[str, Any]: Configuration dictionary with tmux settings
+    """
     return {
         "colors": 256,
         "default-terminal": "screen-256color",
         "history-limit": 5000,
     }
 
 
-def test_custom_server_config(custom_server) -> None:
+def test_custom_server_config(custom_server: Server) -> None:
     """Test a server with custom configuration."""
     # Verify server is running
     assert custom_server.is_alive()
 
     # Verify custom socket name
-    assert "custom-socket" in custom_server.socket_path
+    assert "custom-socket" in str(custom_server.socket_path or "")
 
     # Create a session
     session = custom_server.new_session(session_name="custom-test")
     assert session.name == "custom-test"
 
     # Get color configuration
-    colors = session.server.show_option("default-terminal")
+    colors = custom_server.cmd("show-option", "-g", "default-terminal").stdout
     assert colors is not None
 
 
-def test_testserver_direct_usage() -> None:
-    """Test using TestServer directly as a context manager."""
-    with TestServer() as server:
-        # Create a session
-        session = server.new_session(session_name="direct-test")
-        assert session.name == "direct-test"
+@pytest.mark.usefixtures("request")
+def test_testserver_direct_usage(request: FixtureRequest) -> None:
+    """Test using TestServer directly."""
+    # Get TestServer fixture function
+    server_factory = TestServer(request)
+    
+    # Create a server using the factory function
+    server = server_factory()
+    
+    # Create a session
+    session = server.new_session(session_name="direct-test")
+    assert session.name == "direct-test"
 
-        # Create multiple windows
-        windows = []
-        for i in range(3):
-            window = session.new_window(window_name=f"window-{i}")
-            windows.append(window)
+    # Create multiple windows
+    windows = []
+    for i in range(3):
+        window = session.new_window(window_name=f"window-{i}")
+        windows.append(window)
 
-        # Verify windows were created
-        assert len(session.windows) >= 3
-        for i, window in enumerate(windows):
-            assert f"window-{i}" == window.window_name
+    # Verify windows were created
+    assert len(session.windows) >= 3
+    for i, window in enumerate(windows):
+        assert f"window-{i}" == window.window_name
 
-    # Server is automatically cleaned up outside the context
+    # Server is automatically cleaned up by pytest