Merge pull request #432 from richardsheridan/wait_task_rescheduled_re…

…turns fix regression after trio 0.27.0 with explicit wait_task_rescheduled
richardsheridan · Oct 19, 2024 · 35582a0 · 35582a0
2 parents 3edcdb0 + 71f5b52
commit 35582a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/requirements/install.txt b/requirements/install.txt
@@ -28,5 +28,5 @@ sortedcontainers==2.4.0
     # via trio
 tblib==3.0.0
     # via -r requirements\install.in
-trio==0.26.0
+trio==0.27.0
     # via -r requirements\install.in
diff --git a/trio_parallel/_impl.py b/trio_parallel/_impl.py
@@ -186,7 +186,11 @@ async def _aclose(self):
         with trio.CancelScope(shield=True):
             if self._lifetime.calc_running() != 0:
                 assert self is not get_default_context()
-                await trio.sleep_forever()  # woken by self._lifetime.__aexit__
+
+                def abort_func(raise_cancel):  # pragma: no cover
+                    return trio.lowlevel.Abort.FAILED  # never cancelled anyway
+
+                await trio.lowlevel.wait_task_rescheduled(abort_func)
             await trio.to_thread.run_sync(
                 self._worker_cache.shutdown, self.grace_period
             )