https://github.com/python/cpython/commit/09fe550ecc392927133e3f91856c630d1310ccdb
commit: 09fe550ecc392927133e3f91856c630d1310ccdb
branch: main
author: Kumar Aditya <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2025-02-09T12:05:39Z
summary:
gh-129874: improve asyncio tests to use correct internal functions (#129887)
files:
M Lib/test/test_asyncio/test_eager_task_factory.py
M Lib/test/test_asyncio/test_free_threading.py
M Lib/test/test_asyncio/test_graph.py
diff --git a/Lib/test/test_asyncio/test_eager_task_factory.py
b/Lib/test/test_asyncio/test_eager_task_factory.py
index 10450c11b68279..bb0760a6967dba 100644
--- a/Lib/test/test_asyncio/test_eager_task_factory.py
+++ b/Lib/test/test_asyncio/test_eager_task_factory.py
@@ -267,12 +267,33 @@ async def run():
class PyEagerTaskFactoryLoopTests(EagerTaskFactoryLoopTests,
test_utils.TestCase):
Task = tasks._PyTask
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._py_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
+
+
@unittest.skipUnless(hasattr(tasks, '_CTask'),
'requires the C _asyncio module')
class CEagerTaskFactoryLoopTests(EagerTaskFactoryLoopTests,
test_utils.TestCase):
Task = getattr(tasks, '_CTask', None)
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
+
+
+ @unittest.skip("skip")
def test_issue105987(self):
code = """if 1:
from _asyncio import _swap_current_task
@@ -400,31 +421,83 @@ class BaseEagerTaskFactoryTests(BaseTaskCountingTests):
class NonEagerTests(BaseNonEagerTaskFactoryTests, test_utils.TestCase):
- Task = asyncio.Task
+ Task = asyncio.tasks._CTask
+
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
class EagerTests(BaseEagerTaskFactoryTests, test_utils.TestCase):
- Task = asyncio.Task
+ Task = asyncio.tasks._CTask
+
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
class NonEagerPyTaskTests(BaseNonEagerTaskFactoryTests, test_utils.TestCase):
Task = tasks._PyTask
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._py_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
+
class EagerPyTaskTests(BaseEagerTaskFactoryTests, test_utils.TestCase):
Task = tasks._PyTask
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._py_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
@unittest.skipUnless(hasattr(tasks, '_CTask'),
'requires the C _asyncio module')
class NonEagerCTaskTests(BaseNonEagerTaskFactoryTests, test_utils.TestCase):
Task = getattr(tasks, '_CTask', None)
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
+
@unittest.skipUnless(hasattr(tasks, '_CTask'),
'requires the C _asyncio module')
class EagerCTaskTests(BaseEagerTaskFactoryTests, test_utils.TestCase):
Task = getattr(tasks, '_CTask', None)
+ def setUp(self):
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+ return super().tearDown()
+
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_asyncio/test_free_threading.py
b/Lib/test/test_asyncio/test_free_threading.py
index d0221d87062c5b..199dbbdda5e8a6 100644
--- a/Lib/test/test_asyncio/test_free_threading.py
+++ b/Lib/test/test_asyncio/test_free_threading.py
@@ -40,7 +40,7 @@ async def coro():
self.assertEqual(task.get_loop(), loop)
self.assertFalse(task.done())
- current = self.current_task()
+ current = asyncio.current_task()
self.assertEqual(current.get_loop(), loop)
self.assertSetEqual(all_tasks, tasks | {current})
future.set_result(None)
@@ -101,8 +101,12 @@ def test_task_different_thread_finalized(self) -> None:
async def func():
nonlocal task
task = asyncio.current_task()
-
- thread = Thread(target=lambda: asyncio.run(func()))
+ def runner():
+ with asyncio.Runner() as runner:
+ loop = runner.get_loop()
+ loop.set_task_factory(self.factory)
+ runner.run(func())
+ thread = Thread(target=runner)
thread.start()
thread.join()
wr = weakref.ref(task)
@@ -164,7 +168,15 @@ async def main():
class TestPyFreeThreading(TestFreeThreading, TestCase):
all_tasks = staticmethod(asyncio.tasks._py_all_tasks)
- current_task = staticmethod(asyncio.tasks._py_current_task)
+
+ def setUp(self):
+ self._old_current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._py_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task =
self._old_current_task
+ return super().tearDown()
def factory(self, loop, coro, **kwargs):
return asyncio.tasks._PyTask(coro, loop=loop, **kwargs)
@@ -173,7 +185,16 @@ def factory(self, loop, coro, **kwargs):
@unittest.skipUnless(hasattr(asyncio.tasks, "_c_all_tasks"), "requires
_asyncio")
class TestCFreeThreading(TestFreeThreading, TestCase):
all_tasks = staticmethod(getattr(asyncio.tasks, "_c_all_tasks", None))
- current_task = staticmethod(getattr(asyncio.tasks, "_c_current_task",
None))
+
+ def setUp(self):
+ self._old_current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
asyncio.tasks._c_current_task
+ return super().setUp()
+
+ def tearDown(self):
+ asyncio.current_task = asyncio.tasks.current_task =
self._old_current_task
+ return super().tearDown()
+
def factory(self, loop, coro, **kwargs):
return asyncio.tasks._CTask(coro, loop=loop, **kwargs)
diff --git a/Lib/test/test_asyncio/test_graph.py
b/Lib/test/test_asyncio/test_graph.py
index fd2160d4ca3137..62f6593c31d2d1 100644
--- a/Lib/test/test_asyncio/test_graph.py
+++ b/Lib/test/test_asyncio/test_graph.py
@@ -369,6 +369,8 @@ def setUp(self):
futures.future_discard_from_awaited_by =
futures._c_future_discard_from_awaited_by
asyncio.future_discard_from_awaited_by =
futures.future_discard_from_awaited_by
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
tasks._c_current_task
def tearDown(self):
futures = asyncio.futures
@@ -390,6 +392,8 @@ def tearDown(self):
futures.Future = self._Future
del self._Future
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
+
@unittest.skipIf(
not hasattr(asyncio.futures, "_py_future_add_to_awaited_by"),
@@ -414,6 +418,9 @@ def setUp(self):
futures.future_discard_from_awaited_by =
futures._py_future_discard_from_awaited_by
asyncio.future_discard_from_awaited_by =
futures.future_discard_from_awaited_by
+ self._current_task = asyncio.current_task
+ asyncio.current_task = asyncio.tasks.current_task =
tasks._py_current_task
+
def tearDown(self):
futures = asyncio.futures
@@ -434,3 +441,5 @@ def tearDown(self):
asyncio.Future = self._Future
futures.Future = self._Future
del self._Future
+
+ asyncio.current_task = asyncio.tasks.current_task = self._current_task
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
