test: adapt to github win runner

leavers · Dec 27, 2023 · afa147b · afa147b
1 parent ec1e474
commit afa147b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,7 +1,27 @@
+import time
 from typing import Union
 
 from flexexecutor import AsyncPoolExecutor, ThreadPoolExecutor
 
+AnyPoolExecutor = Union[AsyncPoolExecutor, ThreadPoolExecutor]
 
-def alive_threads(executor: Union[AsyncPoolExecutor, ThreadPoolExecutor]):
+
+def alive_threads(executor: AnyPoolExecutor):
     return [t for t in executor._threads if t.is_alive()]
+
+
+def wait_for_alive_threads(
+    executor: AnyPoolExecutor,
+    expect: int,
+    timeout: float,
+) -> int:
+    t = -1
+    tick = time.monotonic()
+    while True:
+        t = len(alive_threads(executor))
+        if t == expect:
+            break
+        if time.monotonic() - tick > timeout:
+            break
+        time.sleep(0.05)
+    return t
diff --git a/tests/test_async.py b/tests/test_async.py
@@ -7,7 +7,7 @@
 from pytest_mock import MockerFixture
 
 from flexexecutor import AsyncPoolExecutor
-from tests.conftest import alive_threads
+from tests.conftest import alive_threads, wait_for_alive_threads
 
 
 async def simple_return(n: int = 1):
@@ -141,8 +141,7 @@ def test_finite_timeout():
         assert len(alive_threads(executor)) == 1
         future.result()
 
-        time.sleep(0.2)
-        assert len(alive_threads(executor)) == 0
+        assert wait_for_alive_threads(executor, 0, 0.5) == 0
 
         executor.submit(simple_delay_return, wait=0.1)
         assert len(alive_threads(executor)) == 1

diff --git a/tests/test_thread.py b/tests/test_thread.py
@@ -6,7 +6,7 @@
 from pytest_mock import MockerFixture
 
 from flexexecutor import ThreadPoolExecutor
-from tests.conftest import alive_threads
+from tests.conftest import alive_threads, wait_for_alive_threads
 
 
 def simple_delay_return(n: int = 1, wait: float = 0.1):
@@ -128,8 +128,7 @@ def test_worker_alive():
         assert len(alive_threads(executor)) == 0
         executor.submit(lambda: 1)
         assert len(alive_threads(executor)) == 1
-        time.sleep(0.5)
-        assert len(alive_threads(executor)) == 0
+        assert wait_for_alive_threads(executor, 0, 0.5) == 0
 
 
 def test_max_workers():
@@ -147,11 +146,9 @@ def test_finite_timeout():
         assert len(alive_threads(executor)) == 1
         future.result()
 
-        time.sleep(0.5)
-        assert len(alive_threads(executor)) == 0
-
+        assert wait_for_alive_threads(executor, 0, 0.5) == 0
         executor.submit(lambda: time.sleep(0.1))
-        assert len(alive_threads(executor)) == 1
+        assert wait_for_alive_threads(executor, 1, 0.1) == 1
 
     assert len(alive_threads(executor)) == 0