!squash test_waider.py

Author: tony

tests/_internal/test_waiter.py

@@ -11,8 +11,7 @@
 
 import pytest
 
-from libtmux.exc import WaitTimeout
-from libtmux.test.waiter import (
+from libtmux._internal.waiter import (
     ContentMatchType,
     PaneContentWaiter,
     _contains_match,
@@ -28,6 +27,7 @@
     wait_for_window_panes,
     wait_until_pane_ready,
 )
+from libtmux.exc import WaitTimeout
 
 if TYPE_CHECKING:
     from libtmux.pane import Pane
@@ -1352,7 +1352,7 @@ def test_wait_for_pane_content_exception_handling(
     This tests how wait_for_pane_content handles exceptions raised during
     the content checking process.
     """
-    import libtmux.test.waiter
+    import libtmux._internal.waiter
 
     # Use monkeypatch to replace the retry_until_extended function
     def mock_retry_value_error(
@@ -1363,7 +1363,7 @@ def mock_retry_value_error(
 
     # Patch first scenario - ValueError
     monkeypatch.setattr(
-        libtmux.test.waiter,
+        libtmux._internal.waiter,
         "retry_until_extended",
         mock_retry_value_error,
     )
@@ -1389,7 +1389,7 @@ def mock_retry_timeout(*args: object, **kwargs: object) -> tuple[bool, Exception
 
     # Patch second scenario - WaitTimeout
     monkeypatch.setattr(
-        libtmux.test.waiter,
+        libtmux._internal.waiter,
         "retry_until_extended",
         mock_retry_timeout,
     )
@@ -1416,7 +1416,7 @@ def mock_retry_raise(*args: object, **kwargs: object) -> tuple[bool, Exception]:
 
     # Patch third scenario - raising exception
     monkeypatch.setattr(
-        libtmux.test.waiter,
+        libtmux._internal.waiter,
         "retry_until_extended",
         mock_retry_raise,
     )
@@ -1656,8 +1656,8 @@ def test_wait_for_all_content_timeout_exception(
     This test specifically targets the exception handling in lines 1069, 1077-1078.
     """
     # Import the module directly
-    import libtmux.test.waiter
-    from libtmux.test.waiter import WaitResult
+    import libtmux._internal.waiter
+    from libtmux._internal.waiter import WaitResult
 
     # Mock the retry_until_extended function to simulate a WaitTimeout
     def mock_retry_timeout(*args: object, **kwargs: object) -> tuple[bool, Exception]:
@@ -1677,7 +1677,7 @@ def mock_retry_timeout(*args: object, **kwargs: object) -> tuple[bool, Exception
 
     # Apply the patch
     monkeypatch.setattr(
-        libtmux.test.waiter,
+        libtmux._internal.waiter,
         "retry_until_extended",
         mock_retry_timeout,
     )
@@ -1834,7 +1834,7 @@ def test_wait_for_pane_content_specific_type_errors(wait_pane: Pane) -> None:
     various type error conditions in different match types.
     """
     # Import error message constants from the module
-    from libtmux.test.waiter import (
+    from libtmux._internal.waiter import (
         ERR_CONTAINS_TYPE,
         ERR_EXACT_TYPE,
         ERR_PREDICATE_TYPE,