!squash more pytest examples

Author: tony

tests/pytest_examples/test_complex_layouts.py

@@ -9,32 +9,46 @@ def test_complex_layouts(session) -> None:
     """Test creating and interacting with complex window layouts."""
     # Create a window with multiple panes in a specific layout
     window = session.new_window(window_name="complex-layout")
+    main_pane = window.attached_pane
+    main_pane.send_keys("echo 'Main Pane'", enter=True)
 
-    # Start with a simple pane
-    main_pane = window.active_pane
+    # Split vertically
+    right_pane = main_pane.split_window(vertical=True)
+    left_pane = main_pane  # For clarity
 
-    # Split into a left pane and right pane
-    left_pane = main_pane
-    right_pane = window.split_window(vertical=True)  # Vertical split (right pane)
+    # Give window manager time to adjust
+    time.sleep(1)
 
-    # Verify we have two panes
-    assert len(window.panes) == 2
+    # Verify we have 2 panes
+    assert len(window.panes) == 2, f"Expected 2 panes, but got {len(window.panes)}"
 
     # Apply a layout
     window.select_layout("main-vertical")
+    time.sleep(1)  # Give tmux time to apply the layout
 
     # Verify the layout was applied
     current_layout = window.get("window_layout")
     assert current_layout is not None, "Layout was not set"
 
     # Send unique commands to each pane for identification
+    left_pane.send_keys("clear", enter=True)
+    right_pane.send_keys("clear", enter=True)
+    time.sleep(1)
+
     left_pane.send_keys("echo 'Left Pane'", enter=True)
     right_pane.send_keys("echo 'Right Pane'", enter=True)
-    time.sleep(2)  # Increase sleep time to ensure output is captured
+    time.sleep(3)  # 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())
-    assert any("Right Pane" in line for line in right_pane.capture_pane())
+    left_output = left_pane.capture_pane()
+    right_output = right_pane.capture_pane()
+
+    assert any("Left Pane" in line for line in left_output), (
+        f"Left pane content not found in: {left_output}"
+    )
+    assert any("Right Pane" in line for line in right_output), (
+        f"Right pane content not found in: {right_output}"
+    )
 
 
 def test_tiled_layout(session) -> None:

tests/pytest_examples/test_process_control.py

@@ -26,22 +26,43 @@ def pane(window):
 def test_process_detection(pane) -> None:
     """Test detecting running processes in a pane."""
     # Start a long-running process
-    pane.send_keys("sleep 10", enter=True)
+    pane.send_keys("sleep 10 &", enter=True)  # Run in background
     time.sleep(0.5)
 
-    # Get information about the running process
-    ps_output = pane.cmd("ps", "-o", "pid,command").stdout
+    # Get the pane's TTY
+    pane_tty = pane.cmd("display-message", "-p", "#{pane_tty}").stdout[0]
+
+    # Clear the pane
+    pane.send_keys("clear", enter=True)
+    time.sleep(0.5)
+
+    # Get information about the running process using system ps command
+    pane.send_keys(f"ps -t {pane_tty} -o pid,command | grep sleep", enter=True)
+    time.sleep(1)
+
+    # Capture the output
+    ps_output = pane.capture_pane()
 
     # Verify the sleep command is running
-    assert any("sleep 10" in line for line in ps_output)
+    assert any("sleep 10" in line for line in ps_output), (
+        f"Expected 'sleep 10' in: {ps_output}"
+    )
+
+    # Kill the process (find PID and kill it)
+    pane.send_keys("pkill -f 'sleep 10'", enter=True)
+    time.sleep(1)
 
-    # Kill the process
-    pane.send_keys(chr(3), literal=True)  # Send Ctrl+C
+    # Clear the pane again
+    pane.send_keys("clear", enter=True)
     time.sleep(0.5)
 
     # Verify the process has stopped
-    ps_output = pane.cmd("ps", "-o", "pid,command").stdout
-    assert not any("sleep 10" in line for line in ps_output)
+    pane.send_keys(f"ps -t {pane_tty} -o pid,command | grep sleep", enter=True)
+    time.sleep(1)
+    ps_output = pane.capture_pane()
+    assert not any("sleep 10" in line for line in ps_output), (
+        f"Found 'sleep 10' in: {ps_output}"
+    )
 
 
 def test_command_output_scrollback(pane) -> None:

tests/pytest_examples/test_window_management.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import time
+
 
 def test_window_renaming(session) -> None:
     """Test renaming windows."""
@@ -28,6 +30,9 @@ def test_window_moving(session) -> None:
     session.new_window(window_name="window-2")
     window3 = session.new_window(window_name="window-3")
 
+    # Let tmux settle
+    time.sleep(0.5)
+
     # Get initial indices
     index1 = window1.index
 
@@ -41,9 +46,19 @@ def test_window_moving(session) -> None:
     # Verify window 1 has moved
     assert window1.index != index1
 
-    # Move window 3 to index 1
+    # Get a free index for window 3 to move to
+    # Note: We can't just use index 1 as it might be taken
+    all_indices = [int(w.index) for w in session.windows]
+    for i in range(1, 10):
+        if i not in all_indices:
+            free_index = str(i)
+            break
+    else:
+        free_index = "10"  # Fallback
+
+    # Move window 3 to free index
     initial_index3 = window3.index
-    window3.move_window(destination="1")
+    window3.move_window(destination=free_index)
 
     # Refresh windows
     session.list_windows()  # This refreshes the windows
@@ -60,26 +75,46 @@ def test_window_switching(session) -> None:
     window2 = session.new_window(window_name="switch-test-2")
     window3 = session.new_window(window_name="switch-test-3")
 
-    # Verify window 3 is active (most recently created)
-    assert session.active_window.id == window3.id
+    # Give tmux time to update
+    time.sleep(0.5)
+
+    # Refresh session to get current state
+    session.refresh()
+
+    # Tmux may set any window as active - can vary across platforms
+    # So first we'll explicitly set window3 as active
+    session.select_window(window3.index)
+    time.sleep(0.5)
+    session.refresh()
+
+    # Now verify window 3 is active
+    assert session.active_window.id == window3.id, (
+        f"Expected active window {window3.id}, got {session.active_window.id}"
+    )
 
     # Switch to window 1
     session.select_window(window1.index)
+    time.sleep(0.5)
 
     # Refresh the session information
     session.refresh()
 
     # Verify window 1 is now active
-    assert session.active_window.id == window1.id
+    assert session.active_window.id == window1.id, (
+        f"Expected active window {window1.id}, got {session.active_window.id}"
+    )
 
     # Switch to window 2 by name
     session.select_window("switch-test-2")
+    time.sleep(0.5)
 
     # Refresh the session information
     session.refresh()
 
     # Verify window 2 is now active
-    assert session.active_window.id == window2.id
+    assert session.active_window.id == window2.id, (
+        f"Expected active window {window2.id}, got {session.active_window.id}"
+    )
 
 
 def test_window_killing(session) -> None: