fix(tests): properly fix linting and type checking issues in waiter tests

- Fixed all mypy type errors by using proper type annotations

- Updated string | list handling to avoid 'in' operator type issues

- Fixed line length issues

- Cleaned up imports

- Maintained test coverage at 70% for waiter module

Author: tony

tests/test/test_waiter.py

@@ -4,7 +4,7 @@
 
 import re
 import time
-from collections.abc import Callable, Generator, Sequence
+from collections.abc import Callable, Generator
 from typing import TYPE_CHECKING
 
 import pytest
@@ -402,7 +402,11 @@ def add_content() -> None:
     thread.start()
 
     # Wait for any of these patterns
-    patterns: Sequence[str] = ["Success", "Error:", "timeout"]
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        "Success",
+        "Error:",
+        "timeout",
+    ]
     result = wait_for_any_content(
         wait_pane,
         patterns,
@@ -436,7 +440,7 @@ def test_wait_for_any_content_mixed_match_types(wait_pane: Pane) -> None:
     ]
 
     # One will be searched with CONTAINS, the other with REGEX
-    patterns = [
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
         "test line",  # String for CONTAINS
         r"number \d+",  # Regex pattern for REGEX
     ]
@@ -495,9 +499,13 @@ def add_content() -> None:
     thread.start()
 
     # Wait for all patterns to appear
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        "Database connected",
+        "Server started",
+    ]
     result = wait_for_all_content(
         wait_pane,
-        ["Database connected", "Server started"],
+        patterns,
         ContentMatchType.CONTAINS,
         timeout=3,
     )
@@ -511,14 +519,8 @@ def add_content() -> None:
         assert isinstance(matched_list, list)
 
         # Check that both strings are in the matched patterns
-        assert any(
-            "Database connected" in item
-            for item in matched_list
-            if isinstance(item, str)
-        )
-        assert any(
-            "Server started" in item for item in matched_list if isinstance(item, str)
-        )
+        assert any("Database connected" in str(item) for item in matched_list)
+        assert any("Server started" in str(item) for item in matched_list)
 
 
 def test_wait_for_all_content_no_raise(wait_pane: Pane) -> None:
@@ -531,7 +533,10 @@ def test_wait_for_all_content_no_raise(wait_pane: Pane) -> None:
     time.sleep(0.5)
 
     # Look for one pattern that exists and one that doesn't
-    patterns = ["Found text", "this will never be found in a million years"]
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        "Found text",
+        "this will never be found in a million years",
+    ]
 
     # Without raising, it should return a failed result
     result = wait_for_all_content(
@@ -564,7 +569,7 @@ def test_wait_for_all_content_mixed_match_types(wait_pane: Pane) -> None:
         ContentMatchType.REGEX,  # For regex match
     ]
 
-    patterns = [
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
         "contains",  # String for CONTAINS
         r"number \d+",  # Regex pattern for REGEX
     ]
@@ -579,10 +584,17 @@ def test_wait_for_all_content_mixed_match_types(wait_pane: Pane) -> None:
 
     assert result.success
     assert isinstance(result.matched_content, list)
+    assert len(result.matched_content) >= 2
 
     # The first match should be "contains" and the second should contain "number"
-    assert "contains" in result.matched_content[0]
-    assert "number" in result.matched_content[1]
+    first_match = str(result.matched_content[0])
+    second_match = str(result.matched_content[1])
+
+    assert result.matched_content[0] is not None
+    assert "contains" in first_match
+
+    assert result.matched_content[1] is not None
+    assert "number" in second_match
 
 
 def test_wait_for_all_content_type_error(wait_pane: Pane) -> None:
@@ -618,8 +630,8 @@ def test_wait_for_pane_content_exact_match(wait_pane: Pane) -> None:
     # Wait for content to ensure it's present
     time.sleep(0.5)
 
-    # Instead of trying exact match on a line (which is prone to shell prompt variations)
-    # Let's test if the content contains our string
+    # Instead of trying exact match on a line (which is prone to shell prompt
+    # variations) Let's test if the content contains our string
     result = wait_for_pane_content(
         wait_pane,
         test_content,
@@ -750,7 +762,10 @@ def test_pane_content_waiter_wait_for_exact_text(wait_pane: Pane) -> None:
     )
 
     assert result.success
-    assert "Exact Test" in result.matched_content if result.matched_content else False
+    assert result.matched_content is not None
+    matched_content = result.matched_content
+    if matched_content is not None:
+        assert "Exact Test" in matched_content
 
 
 def test_pane_content_waiter_wait_for_regex(wait_pane: Pane) -> None:
@@ -765,11 +780,10 @@ def test_pane_content_waiter_wait_for_regex(wait_pane: Pane) -> None:
     )
 
     assert result.success
-    assert (
-        "Pattern 123 Test" in result.matched_content
-        if result.matched_content
-        else False
-    )
+    assert result.matched_content is not None
+    matched_content = result.matched_content
+    if matched_content is not None:
+        assert "Pattern 123 Test" in matched_content
 
 
 def test_pane_content_waiter_wait_for_predicate(wait_pane: Pane) -> None:
@@ -867,7 +881,9 @@ def test_pane_content_waiter_with_line_range(wait_pane: Pane) -> None:
 
     assert result.success is True
     assert result.matched_content is not None
-    assert "target-text" in result.matched_content
+    matched_content = result.matched_content
+    if matched_content is not None:
+        assert "target-text" in matched_content
 
 
 def test_pane_content_waiter_wait_until_ready(wait_pane: Pane) -> None:
@@ -953,7 +969,10 @@ def test_wait_for_pane_content_regex_line_match(wait_pane: Pane) -> None:
     )
 
     assert result.success is True
-    assert "pattern abc123" in result.matched_content
+    assert result.matched_content is not None
+    matched_content = result.matched_content
+    if matched_content is not None:
+        assert "pattern abc123" in matched_content
     assert result.match_line is not None
 
     # The match should be on the second line we added
@@ -972,7 +991,10 @@ def test_wait_for_all_content_with_line_range(wait_pane: Pane) -> None:
     wait_pane.send_keys("echo 'Line 2'", enter=True)
     time.sleep(0.2)  # Wait for commands to complete
 
-    patterns: Sequence[str] = ["Line 1", "Line 2"]
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        "Line 1",
+        "Line 2",
+    ]
 
     result = wait_for_all_content(
         wait_pane,
@@ -983,7 +1005,10 @@ def test_wait_for_all_content_with_line_range(wait_pane: Pane) -> None:
     )
 
     assert result.success
-    assert result.matched_content == patterns
+    assert result.matched_content is not None
+    assert len(result.matched_content) == 2
+    assert "Line 1" in str(result.matched_content[0])
+    assert "Line 2" in str(result.matched_content[1])
 
 
 def test_wait_for_all_content_timeout(wait_pane: Pane) -> None:
@@ -993,7 +1018,9 @@ def test_wait_for_all_content_timeout(wait_pane: Pane) -> None:
     time.sleep(0.2)  # Ensure the clear command completes
 
     # Pattern that won't be found in the pane content
-    patterns: Sequence[str] = ["pattern that doesn't exist"]
+    patterns: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        "pattern that doesn't exist"
+    ]
     result = wait_for_all_content(
         wait_pane,
         patterns,
@@ -1123,7 +1150,10 @@ def has_ten_lines(content: list[str]) -> bool:
         return len(content) >= 10
 
     # Test with predicates
-    predicates: Sequence[Callable[[list[str]], bool]] = [has_two_lines, has_ten_lines]
+    predicates: list[str | re.Pattern[str] | Callable[[list[str]], bool]] = [
+        has_two_lines,
+        has_ten_lines,
+    ]
     result = wait_for_any_content(
         wait_pane,
         predicates,