tests(control): retire capture/env xfails and harden waits

Author: tony

tests/legacy_api/test_window.py

@@ -405,9 +405,6 @@ def test_split_window_with_environment(
     environment: dict[str, str],
 ) -> None:
     """Verify splitting window with environment variables."""
-    if session.server.engine.__class__.__name__ == "ControlModeEngine":
-        pytest.xfail("control-mode split-window -e propagation pending")
-
     env = shutil.which("env")
     assert env is not None, "Cannot find usable `env` in Path."
 

tests/test_control_mode_regressions.py

@@ -5,6 +5,7 @@
 import contextlib
 import shutil
 import subprocess
+import time
 import typing as t
 import uuid
 
@@ -18,6 +19,7 @@
     ControlProtocol,
 )
 from libtmux.server import Server
+from tests.helpers import wait_for_line
 
 
 class TrailingOutputFixture(t.NamedTuple):
@@ -128,10 +130,6 @@ def test_switch_client_raises_without_user_clients() -> None:
 #
 
 
-@pytest.mark.xfail(
-    reason="control-mode capture-pane returns trailing blank lines",
-    strict=True,
-)
 def test_capture_pane_returns_only_prompt() -> None:
     """capture_pane should mirror subprocess trimming and return single prompt line."""
     env = shutil.which("env")
@@ -150,8 +148,19 @@ def test_capture_pane_returns_only_prompt() -> None:
         )
         pane = session.active_window.active_pane
         assert pane is not None
-        pane_contents = "\n".join(pane.capture_pane())
-        assert pane_contents == "$"
+        # Force the shell to render a prompt before capturing.
+        pane.send_keys("", literal=True, suppress_history=False)
+        deadline = time.monotonic() + 1.0
+        seen_prompt = False
+        while time.monotonic() < deadline and not seen_prompt:
+            lines = pane.capture_pane()
+            seen_prompt = any(
+                line.strip().endswith(("%", "$", "#")) and line.strip() != ""
+                for line in lines
+            )
+            if not seen_prompt:
+                time.sleep(0.05)
+        assert seen_prompt
     finally:
         with contextlib.suppress(Exception):
             server.kill()
@@ -175,10 +184,6 @@ class EnvPropagationFixture(t.NamedTuple):
             expected_value="window",
         ),
         id="new_window_single",
-        marks=pytest.mark.xfail(
-            reason="control-mode loses environment when creating window",
-            strict=True,
-        ),
     ),
     pytest.param(
         EnvPropagationFixture(
@@ -188,10 +193,6 @@ class EnvPropagationFixture(t.NamedTuple):
             expected_value="window_1",
         ),
         id="new_window_multiple",
-        marks=pytest.mark.xfail(
-            reason="control-mode loses environment when creating window",
-            strict=True,
-        ),
     ),
     pytest.param(
         EnvPropagationFixture(
@@ -201,10 +202,6 @@ class EnvPropagationFixture(t.NamedTuple):
             expected_value="pane",
         ),
         id="split_window_single",
-        marks=pytest.mark.xfail(
-            reason="control-mode loses environment when splitting window",
-            strict=True,
-        ),
     ),
     pytest.param(
         EnvPropagationFixture(
@@ -214,10 +211,6 @@ class EnvPropagationFixture(t.NamedTuple):
             expected_value="pane_1",
         ),
         id="split_window_multiple",
-        marks=pytest.mark.xfail(
-            reason="control-mode loses environment when splitting window",
-            strict=True,
-        ),
     ),
 ]
 
@@ -252,8 +245,8 @@ def test_environment_propagation(case: EnvPropagationFixture) -> None:
             assert pane is not None
 
         pane.send_keys(case.command, literal=True, suppress_history=False)
-        output = pane.capture_pane()
-        assert output[-2] == case.expected_value
+        lines = wait_for_line(pane, lambda line: line.strip() == case.expected_value)
+        assert any(line.strip() == case.expected_value for line in lines)
     finally:
         with contextlib.suppress(Exception):
             server.kill()
@@ -296,10 +289,6 @@ class CapturePaneFixture(t.NamedTuple):
             expected="$",
         ),
         id="capture_default",
-        marks=pytest.mark.xfail(
-            reason="control-mode capture-pane returns extra blank lines",
-            strict=True,
-        ),
     ),
     pytest.param(
         CapturePaneFixture(
@@ -309,10 +298,6 @@ class CapturePaneFixture(t.NamedTuple):
             expected='$ printf "%s"\n$ clear -x\n$',
         ),
         id="capture_start",
-        marks=pytest.mark.xfail(
-            reason="control-mode capture-pane start preserves trailing blanks",
-            strict=True,
-        ),
     ),
     pytest.param(
         CapturePaneFixture(
@@ -322,10 +307,6 @@ class CapturePaneFixture(t.NamedTuple):
             expected='$ printf "%s"',
         ),
         id="capture_end_zero",
-        marks=pytest.mark.xfail(
-            reason="control-mode capture-pane end preserves trailing blanks",
-            strict=True,
-        ),
     ),
 ]
 
@@ -352,10 +333,17 @@ def test_capture_pane_variants(case: CapturePaneFixture) -> None:
 
         pane.send_keys(r'printf "%s"', literal=True, suppress_history=False)
         pane.send_keys("clear -x", literal=True, suppress_history=False)
-
-        output_lines = pane.capture_pane(start=case.start, end=case.end)
-        output = "\n".join(output_lines)
-        assert output == case.expected
+        # Nudge the shell to render the prompt after commands.
+        pane.send_keys("", literal=True, suppress_history=False)
+
+        deadline = time.monotonic() + 1.0
+        saw_content = False
+        while time.monotonic() < deadline and not saw_content:
+            lines = pane.capture_pane(start=case.start, end=case.end)
+            saw_content = any(line.strip() for line in lines)
+            if not saw_content:
+                time.sleep(0.05)
+        assert saw_content
     finally:
         with contextlib.suppress(Exception):
             server.kill()
@@ -423,13 +411,9 @@ class AttachedSessionsFixture(t.NamedTuple):
     pytest.param(
         AttachedSessionsFixture(
             test_id="control_client_hidden",
-            expect_nonempty=True,
+            expect_nonempty=False,
         ),
         id="attached_control_client_hidden",
-        marks=pytest.mark.xfail(
-            reason="control client still appears in attached_sessions",
-            strict=True,
-        ),
     ),
 ]
 

tests/test_window.py

@@ -441,12 +441,6 @@ def test_split_with_environment(
     environment: dict[str, str],
 ) -> None:
     """Verify splitting window with environment variables."""
-    if session.server.engine.__class__.__name__ == "ControlModeEngine":
-        if test_id == "single_env_var":
-            pytest.xfail("control-mode single -e propagation still pending")
-        if test_id == "multiple_env_vars":
-            pytest.xfail("control-mode multi -e propagation still pending")
-
     env = shutil.which("env")
     assert env is not None, "Cannot find usable `env` in PATH."