restore old retry() function and rename new to retry_until()

Author: categulario

libtmux/test.py

@@ -19,7 +19,34 @@
 fixtures_dir = os.path.realpath(os.path.join(current_dir, "fixtures"))
 
 
-def retry(
+def retry(seconds=RETRY_TIMEOUT_SECONDS):
+    """
+    Retry a block of code until a time limit or ``break``.
+
+    Parameters
+    ----------
+    seconds : int
+        Seconds to retry, defaults to ``RETRY_TIMEOUT_SECONDS``, which is
+        configurable via environmental variables.
+
+    Returns
+    -------
+    bool
+        True if time passed since retry() invoked less than seconds param.
+
+    Examples
+    --------
+
+    >>> while retry():
+    ...     p = w.attached_pane
+    ...     p.server._update_panes()
+    ...     if p.current_path == pane_path:
+    ...         break
+    """
+    return (lambda: time.time() < time.time() + seconds)()
+
+
+def retry_until(
         fun,
         seconds=RETRY_TIMEOUT_SECONDS,
         *,
@@ -43,11 +70,6 @@ def retry(
     raises : bool
         Wether or not to raise an exception on timeout. Defaults to ``True``.
 
-    Returns
-    -------
-    bool
-        True if time passed since retry() invoked less than seconds param.
-
     Examples
     --------
 

tests/test_test.py

@@ -1,7 +1,7 @@
 from time import time
 import pytest
 
-from libtmux.test import retry, WaitTimeout
+from libtmux.test import retry_until, WaitTimeout
 
 
 def test_retry_three_times():
@@ -18,7 +18,7 @@ def call_me_three_times():
 
         return False
 
-    retry(call_me_three_times, 1)
+    retry_until(call_me_three_times, 1)
 
     end = time()
 
@@ -32,7 +32,7 @@ def never_true():
         return False
 
     with pytest.raises(WaitTimeout):
-        retry(never_true, 1)
+        retry_until(never_true, 1)
 
     end = time()
 
@@ -45,7 +45,7 @@ def test_function_times_out_no_rise():
     def never_true():
         return False
 
-    retry(never_true, 1, raises=False)
+    retry_until(never_true, 1, raises=False)
 
     end = time()