!squash more pytest_examples

Author: tony

tests/pytest_examples/test_complex_layouts.py

@@ -30,7 +30,7 @@ def test_complex_layouts(session) -> None:
     # Send unique commands to each pane for identification
     left_pane.send_keys("echo 'Left Pane'", enter=True)
     right_pane.send_keys("echo 'Right Pane'", enter=True)
-    time.sleep(0.5)
+    time.sleep(2)  # Increase sleep time to ensure output is captured
 
     # Verify each pane has the correct content
     assert any("Left Pane" in line for line in left_pane.capture_pane())

tests/pytest_examples/test_direct_testserver.py

@@ -2,21 +2,22 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import TYPE_CHECKING, Any
 
 import pytest
-from _pytest.fixtures import FixtureRequest
 
-from libtmux import Server
-from libtmux.pytest_plugin import TestServer
+if TYPE_CHECKING:
+    from libtmux import Server
 
 
 @pytest.fixture
-def custom_config(request: FixtureRequest) -> Dict[str, Any]:
+def custom_config() -> dict[str, Any]:
     """Fixture providing custom configuration settings.
-    
-    Returns:
-        Dict[str, Any]: Configuration dictionary with tmux settings
+
+    Returns
+    -------
+    dict[str, Any]
+        Configuration dictionary with tmux settings
     """
     return {
         "colors": 256,
@@ -25,45 +26,31 @@ def custom_config(request: FixtureRequest) -> Dict[str, Any]:
     }
 
 
-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 str(custom_server.socket_path or "")
+def test_server_config(server: Server, session: object) -> None:
+    """Test server configuration."""
+    # Create a session and verify it works
+    # Note: The session fixture ensures we have an active session already
+    assert session is not None
 
-    # Create a session
-    session = custom_server.new_session(session_name="custom-test")
-    assert session.name == "custom-test"
-
-    # Get color configuration
-    colors = custom_server.cmd("show-option", "-g", "default-terminal").stdout
+    # Get color configuration using tmux command
+    colors = server.cmd("show-option", "-g", "default-terminal").stdout
     assert colors is not None
 
 
-@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"
+def test_server_operations(server: Server) -> None:
+    """Test basic server operations."""
+    # Create a new session for this test
+    new_session = server.new_session(session_name="ops-test")
+    assert new_session.name == "ops-test"
 
     # Create multiple windows
     windows = []
-    for i in range(3):
-        window = session.new_window(window_name=f"window-{i}")
+    expected_window_count = 3
+    for i in range(expected_window_count):
+        window = new_session.new_window(window_name=f"window-{i}")
         windows.append(window)
 
     # Verify windows were created
-    assert len(session.windows) >= 3
+    assert len(new_session.windows) >= expected_window_count
     for i, window in enumerate(windows):
         assert f"window-{i}" == window.window_name
-
-    # Server is automatically cleaned up by pytest

tests/pytest_examples/test_pane_operations.py

@@ -98,7 +98,7 @@ def test_pane_capturing(pane) -> None:
     assert any("Line 3" in line for line in output_lines)
 
     # Capture as a single string
-    output_str = pane.capture_pane(as_str=True)
+    output_str = "\n".join(pane.capture_pane())
     assert isinstance(output_str, str)
     assert "Line 1" in output_str
     assert "Line 2" in output_str

tests/pytest_examples/test_window_management.py

@@ -35,7 +35,7 @@ def test_window_moving(session) -> None:
     window1.move_window()
 
     # Refresh windows
-    session.refresh_windows()
+    session.list_windows()  # This refreshes the windows
     window1.refresh()
 
     # Verify window 1 has moved
@@ -46,7 +46,7 @@ def test_window_moving(session) -> None:
     window3.move_window(destination="1")
 
     # Refresh windows
-    session.refresh_windows()
+    session.list_windows()  # This refreshes the windows
     window3.refresh()
 
     # Verify window 3 has moved
@@ -61,7 +61,7 @@ def test_window_switching(session) -> None:
     window3 = session.new_window(window_name="switch-test-3")
 
     # Verify window 3 is active (most recently created)
-    assert session.get_window_by_id(session.attached_window.id) == window3
+    assert session.active_window.id == window3.id
 
     # Switch to window 1
     session.select_window(window1.index)
@@ -96,7 +96,7 @@ def test_window_killing(session) -> None:
     window2.kill_window()
 
     # Refresh session data
-    session.refresh_windows()
+    session.list_windows()  # This refreshes the windows
 
     # Verify window was killed
     assert len(session.windows) == initial_count - 1