tmux-python
diff --git a/‎tests/test/test_waiter.py
Copy file name to clipboardExpand all lines: tests/test/test_waiter.py
+226-1Lines changed: 226 additions & 1 deletion b/‎tests/test/test_waiter.py
Copy file name to clipboardExpand all lines: tests/test/test_waiter.py
+226-1Lines changed: 226 additions & 1 deletion
@@ -1403,7 +1403,7 @@ def test_wait_for_any_content_exact_match(wait_pane: Pane) -> None:
 
     # Capture the current content to match it exactly later
     content = wait_pane.capture_pane()
-    content_str = "\n".join(content)
+    content_str = "\n".join(content if isinstance(content, list) else [content])
 
     # Run a test that won't match exactly
     non_matching_result = wait_for_any_content(
@@ -1665,3 +1665,228 @@ def mock_time_time() -> float:
 
     # We're not asserting elapsed_time anymore since we're using a direct mock
     # to test the control flow, not actual timing
+
+
+def test_match_regex_across_lines_with_line_numbers(wait_pane: Pane) -> None:
+    """Test the _match_regex_across_lines with line numbers.
+
+    This test specifically targets the line 1169 where matches are identified
+    across multiple lines, including the fallback case when no specific line
+    was matched.
+    """
+    # Create content with newlines that we know exactly
+    content_list = [
+        "line1",
+        "line2",
+        "line3",
+        "line4",
+        "multi",
+        "line",
+        "content",
+    ]
+
+    # Create a pattern that will match across lines but not on a single line
+    pattern = re.compile(r"line2.*line3", re.DOTALL)
+
+    # Call _match_regex_across_lines directly with our controlled content
+    matched, matched_text, match_line = _match_regex_across_lines(content_list, pattern)
+
+    assert matched is True
+    assert matched_text is not None
+    assert "line2" in matched_text
+    assert "line3" in matched_text
+
+    # Now test with a pattern that matches in a specific line
+    pattern = re.compile(r"line3")
+    matched, matched_text, match_line = _match_regex_across_lines(content_list, pattern)
+
+    assert matched is True
+    assert matched_text == "line3"
+    assert match_line is not None
+    assert match_line == 2  # 0-indexed, so line "line3" is at index 2
+
+    # Test the fallback case - match in joined content but not individual lines
+    complex_pattern = re.compile(r"line1.*multi", re.DOTALL)
+    matched, matched_text, match_line = _match_regex_across_lines(
+        content_list, complex_pattern
+    )
+
+    assert matched is True
+    assert matched_text is not None
+    assert "line1" in matched_text
+    assert "multi" in matched_text
+    # In this case, match_line might be None since it's across multiple lines
+
+    # Test no match case
+    pattern = re.compile(r"not_in_content")
+    matched, matched_text, match_line = _match_regex_across_lines(content_list, pattern)
+
+    assert matched is False
+    assert matched_text is None
+    assert match_line is None
+
+
+def test_contains_and_regex_match_fallbacks() -> None:
+    """Test the fallback logic in _contains_match and _regex_match.
+
+    This test specifically targets lines 1108 and 1141 which handle the case
+    when a match is found in joined content but not in individual lines.
+    """
+    # Create content with newlines inside that will create a match when joined
+    # but not in any individual line (notice the split between "first part" and "of")
+    content_with_newlines = [
+        "first part",
+        "of a sentence",
+        "another line",
+    ]
+
+    # Test _contains_match where the match spans across lines
+    # Match "first part" + newline + "of a"
+    search_str = "first part\nof a"
+    matched, matched_text, match_line = _contains_match(
+        content_with_newlines, search_str
+    )
+
+    # The match should be found in the joined content, but not in any individual line
+    assert matched is True
+    assert matched_text == search_str
+    assert match_line is None  # This is the fallback case we're testing
+
+    # Test _regex_match where the match spans across lines
+    pattern = re.compile(r"first part\nof")
+    matched, matched_text, match_line = _regex_match(content_with_newlines, pattern)
+
+    # The match should be found in the joined content, but not in any individual line
+    assert matched is True
+    assert matched_text is not None
+    assert "first part" in matched_text
+    assert match_line is None  # This is the fallback case we're testing
+
+    # Test with a pattern that matches at the end of one line and beginning of another
+    pattern = re.compile(r"part\nof")
+    matched, matched_text, match_line = _regex_match(content_with_newlines, pattern)
+
+    assert matched is True
+    assert matched_text is not None
+    assert "part\nof" in matched_text
+    assert match_line is None  # Fallback case since match spans multiple lines
+
+
+def test_wait_for_pane_content_specific_type_errors(wait_pane: Pane) -> None:
+    """Test specific type error handling in wait_for_pane_content.
+
+    This test targets lines 445-451, 461-465, 481-485 which handle
+    various type error conditions in different match types.
+    """
+    # Import error message constants from the module
+    from libtmux.test.waiter import (
+        ERR_CONTAINS_TYPE,
+        ERR_EXACT_TYPE,
+        ERR_PREDICATE_TYPE,
+        ERR_REGEX_TYPE,
+    )
+
+    # Test EXACT match with non-string pattern
+    with pytest.raises(TypeError) as excinfo:
+        wait_for_pane_content(
+            wait_pane,
+            123,  # type: ignore
+            ContentMatchType.EXACT,
+            timeout=0.1,
+        )
+    assert ERR_EXACT_TYPE in str(excinfo.value)
+
+    # Test CONTAINS match with non-string pattern
+    with pytest.raises(TypeError) as excinfo:
+        wait_for_pane_content(
+            wait_pane,
+            123,  # type: ignore
+            ContentMatchType.CONTAINS,
+            timeout=0.1,
+        )
+    assert ERR_CONTAINS_TYPE in str(excinfo.value)
+
+    # Test REGEX match with invalid pattern type
+    with pytest.raises(TypeError) as excinfo:
+        wait_for_pane_content(
+            wait_pane,
+            123,  # type: ignore
+            ContentMatchType.REGEX,
+            timeout=0.1,
+        )
+    assert ERR_REGEX_TYPE in str(excinfo.value)
+
+    # Test PREDICATE match with non-callable pattern
+    with pytest.raises(TypeError) as excinfo:
+        wait_for_pane_content(
+            wait_pane,
+            "not callable",
+            ContentMatchType.PREDICATE,
+            timeout=0.1,
+        )
+    assert ERR_PREDICATE_TYPE in str(excinfo.value)
+
+
+def test_wait_for_pane_content_exact_match_detailed(wait_pane: Pane) -> None:
+    """Test wait_for_pane_content with EXACT match type in detail.
+
+    This test specifically targets lines 447-451 where the exact
+    match type is handled, including the code path where a match
+    is found and validated.
+    """
+    # Clear the pane first to have more predictable content
+    wait_pane.clear()
+    time.sleep(0.3)  # Give time for clear to take effect
+
+    # Send a unique string that we can test with an exact match
+    wait_pane.send_keys("UNIQUE_TEST_STRING_123", literal=True)
+    time.sleep(0.3)  # Give more time for content to appear
+
+    # Get the current content to work with
+    content = wait_pane.capture_pane()
+    content_str = "\n".join(content if isinstance(content, list) else [content])
+
+    # Verify our test string is in the content
+    assert "UNIQUE_TEST_STRING_123" in content_str
+
+    # Test with CONTAINS match type first (more reliable)
+    result = wait_for_pane_content(
+        wait_pane,
+        "UNIQUE_TEST_STRING_123",
+        ContentMatchType.CONTAINS,
+        timeout=1.0,
+        interval=0.1,
+    )
+    assert result.success
+
+    # Now test with EXACT match but with a simpler approach
+    # Find the exact line that contains our test string
+    for line in content:
+        if "UNIQUE_TEST_STRING_123" in line:
+            exact_line = line
+            break
+    else:
+        # If we can't find the line, use a fallback
+        exact_line = "UNIQUE_TEST_STRING_123"
+
+    # Test the EXACT match against just the line containing our test string
+    result = wait_for_pane_content(
+        wait_pane,
+        exact_line,
+        ContentMatchType.EXACT,
+        timeout=1.0,
+        interval=0.1,
+    )
+
+    assert result.success
+    assert result.matched_content == exact_line
+
+    # Test EXACT match failing case
+    with pytest.raises(WaitTimeout):
+        wait_for_pane_content(
+            wait_pane,
+            "content that definitely doesn't exist",
+            ContentMatchType.EXACT,
+            timeout=0.2,
+            interval=0.1,
+        )