@@ -546,7 +546,7 @@ async def task():
546546 try :
547547 await asyncio .sleep (10 )
548548 except asyncio .CancelledError :
549- asyncio .current_task ().uncancel ()
549+ self .current_task ().uncancel ()
550550 await asyncio .sleep (10 )
551551
552552 try :
@@ -598,7 +598,7 @@ def test_uncancel_structured_blocks(self):
598598 loop = asyncio .new_event_loop ()
599599
600600 async def make_request_with_timeout (* , sleep : float , timeout : float ):
601- task = asyncio .current_task ()
601+ task = self .current_task ()
602602 loop = task .get_loop ()
603603
604604 timed_out = False
@@ -1987,41 +1987,41 @@ async def coro():
19871987 self .assertIsNone (t2 .result ())
19881988
19891989 def test_current_task (self ):
1990- self .assertIsNone (asyncio .current_task (loop = self .loop ))
1990+ self .assertIsNone (self .current_task (loop = self .loop ))
19911991
19921992 async def coro (loop ):
1993- self .assertIs (asyncio .current_task (), task )
1993+ self .assertIs (self .current_task (), task )
19941994
1995- self .assertIs (asyncio .current_task (None ), task )
1996- self .assertIs (asyncio .current_task (), task )
1995+ self .assertIs (self .current_task (None ), task )
1996+ self .assertIs (self .current_task (), task )
19971997
19981998 task = self .new_task (self .loop , coro (self .loop ))
19991999 self .loop .run_until_complete (task )
2000- self .assertIsNone (asyncio .current_task (loop = self .loop ))
2000+ self .assertIsNone (self .current_task (loop = self .loop ))
20012001
20022002 def test_current_task_with_interleaving_tasks (self ):
2003- self .assertIsNone (asyncio .current_task (loop = self .loop ))
2003+ self .assertIsNone (self .current_task (loop = self .loop ))
20042004
20052005 fut1 = self .new_future (self .loop )
20062006 fut2 = self .new_future (self .loop )
20072007
20082008 async def coro1 (loop ):
2009- self .assertTrue (asyncio .current_task () is task1 )
2009+ self .assertTrue (self .current_task () is task1 )
20102010 await fut1
2011- self .assertTrue (asyncio .current_task () is task1 )
2011+ self .assertTrue (self .current_task () is task1 )
20122012 fut2 .set_result (True )
20132013
20142014 async def coro2 (loop ):
2015- self .assertTrue (asyncio .current_task () is task2 )
2015+ self .assertTrue (self .current_task () is task2 )
20162016 fut1 .set_result (True )
20172017 await fut2
2018- self .assertTrue (asyncio .current_task () is task2 )
2018+ self .assertTrue (self .current_task () is task2 )
20192019
20202020 task1 = self .new_task (self .loop , coro1 (self .loop ))
20212021 task2 = self .new_task (self .loop , coro2 (self .loop ))
20222022
20232023 self .loop .run_until_complete (asyncio .wait ((task1 , task2 )))
2024- self .assertIsNone (asyncio .current_task (loop = self .loop ))
2024+ self .assertIsNone (self .current_task (loop = self .loop ))
20252025
20262026 # Some thorough tests for cancellation propagation through
20272027 # coroutines, tasks and wait().
@@ -2252,8 +2252,7 @@ def test_wait_invalid_args(self):
22522252 # wait() expects at least a future
22532253 self .assertRaises (ValueError , self .loop .run_until_complete ,
22542254 asyncio .wait ([]))
2255-
2256- @unittest .skip ("skip" )
2255+ @unittest .skip ("This test is flaky" )
22572256 def test_log_destroyed_pending_task (self ):
22582257
22592258 async def kill_me (loop ):
@@ -2834,6 +2833,7 @@ class CTask_CFuture_Tests(BaseTaskTests, SetMethodsTest,
28342833 Task = getattr (tasks , '_CTask' , None )
28352834 Future = getattr (futures , '_CFuture' , None )
28362835 all_tasks = getattr (tasks , '_c_all_tasks' , None )
2836+ current_task = staticmethod (getattr (tasks , '_c_current_task' , None ))
28372837
28382838 @support .refcount_test
28392839 def test_refleaks_in_task___init__ (self ):
@@ -2866,6 +2866,7 @@ class CTask_CFuture_SubclassTests(BaseTaskTests, test_utils.TestCase):
28662866 Task = getattr (tasks , '_CTask' , None )
28672867 Future = getattr (futures , '_CFuture' , None )
28682868 all_tasks = getattr (tasks , '_c_all_tasks' , None )
2869+ current_task = staticmethod (getattr (tasks , '_c_current_task' , None ))
28692870
28702871
28712872@unittest .skipUnless (hasattr (tasks , '_CTask' ),
@@ -2876,6 +2877,7 @@ class CTaskSubclass_PyFuture_Tests(BaseTaskTests, test_utils.TestCase):
28762877 Task = getattr (tasks , '_CTask' , None )
28772878 Future = futures ._PyFuture
28782879 all_tasks = getattr (tasks , '_c_all_tasks' , None )
2880+ current_task = staticmethod (getattr (tasks , '_c_current_task' , None ))
28792881
28802882
28812883@unittest .skipUnless (hasattr (futures , '_CFuture' ),
@@ -2886,6 +2888,7 @@ class PyTask_CFutureSubclass_Tests(BaseTaskTests, test_utils.TestCase):
28862888 Future = getattr (futures , '_CFuture' , None )
28872889 Task = tasks ._PyTask
28882890 all_tasks = staticmethod (tasks ._py_all_tasks )
2891+ current_task = staticmethod (tasks ._py_current_task )
28892892
28902893
28912894@unittest .skipUnless (hasattr (tasks , '_CTask' ),
@@ -2895,6 +2898,7 @@ class CTask_PyFuture_Tests(BaseTaskTests, test_utils.TestCase):
28952898 Task = getattr (tasks , '_CTask' , None )
28962899 Future = futures ._PyFuture
28972900 all_tasks = getattr (tasks , '_c_all_tasks' , None )
2901+ current_task = staticmethod (getattr (tasks , '_c_current_task' , None ))
28982902
28992903
29002904@unittest .skipUnless (hasattr (futures , '_CFuture' ),
@@ -2904,6 +2908,7 @@ class PyTask_CFuture_Tests(BaseTaskTests, test_utils.TestCase):
29042908 Task = tasks ._PyTask
29052909 Future = getattr (futures , '_CFuture' , None )
29062910 all_tasks = staticmethod (tasks ._py_all_tasks )
2911+ current_task = staticmethod (tasks ._py_current_task )
29072912
29082913
29092914class PyTask_PyFuture_Tests (BaseTaskTests , SetMethodsTest ,
@@ -2912,13 +2917,15 @@ class PyTask_PyFuture_Tests(BaseTaskTests, SetMethodsTest,
29122917 Task = tasks ._PyTask
29132918 Future = futures ._PyFuture
29142919 all_tasks = staticmethod (tasks ._py_all_tasks )
2920+ current_task = staticmethod (tasks ._py_current_task )
29152921
29162922
29172923@add_subclass_tests
29182924class PyTask_PyFuture_SubclassTests (BaseTaskTests , test_utils .TestCase ):
29192925 Task = tasks ._PyTask
29202926 Future = futures ._PyFuture
29212927 all_tasks = staticmethod (tasks ._py_all_tasks )
2928+ current_task = staticmethod (tasks ._py_current_task )
29222929
29232930@unittest .skipUnless (hasattr (tasks , '_CTask' ),
29242931 'requires the C _asyncio module' )
@@ -3006,9 +3013,9 @@ def test__enter_task(self):
30063013 task = mock .Mock ()
30073014 loop = mock .Mock ()
30083015 asyncio ._set_running_loop (loop )
3009- self .assertIsNone (asyncio .current_task (loop ))
3016+ self .assertIsNone (self .current_task (loop ))
30103017 self ._enter_task (loop , task )
3011- self .assertIs (asyncio .current_task (loop ), task )
3018+ self .assertIs (self .current_task (loop ), task )
30123019 self ._leave_task (loop , task )
30133020 asyncio ._set_running_loop (None )
30143021
@@ -3020,7 +3027,7 @@ def test__enter_task_failure(self):
30203027 self ._enter_task (loop , task1 )
30213028 with self .assertRaises (RuntimeError ):
30223029 self ._enter_task (loop , task2 )
3023- self .assertIs (asyncio .current_task (loop ), task1 )
3030+ self .assertIs (self .current_task (loop ), task1 )
30243031 self ._leave_task (loop , task1 )
30253032 asyncio ._set_running_loop (None )
30263033
@@ -3030,7 +3037,7 @@ def test__leave_task(self):
30303037 asyncio ._set_running_loop (loop )
30313038 self ._enter_task (loop , task )
30323039 self ._leave_task (loop , task )
3033- self .assertIsNone (asyncio .current_task (loop ))
3040+ self .assertIsNone (self .current_task (loop ))
30343041 asyncio ._set_running_loop (None )
30353042
30363043 def test__leave_task_failure1 (self ):
@@ -3041,7 +3048,7 @@ def test__leave_task_failure1(self):
30413048 self ._enter_task (loop , task1 )
30423049 with self .assertRaises (RuntimeError ):
30433050 self ._leave_task (loop , task2 )
3044- self .assertIs (asyncio .current_task (loop ), task1 )
3051+ self .assertIs (self .current_task (loop ), task1 )
30453052 self ._leave_task (loop , task1 )
30463053 asyncio ._set_running_loop (None )
30473054
@@ -3051,7 +3058,7 @@ def test__leave_task_failure2(self):
30513058 asyncio ._set_running_loop (loop )
30523059 with self .assertRaises (RuntimeError ):
30533060 self ._leave_task (loop , task )
3054- self .assertIsNone (asyncio .current_task (loop ))
3061+ self .assertIsNone (self .current_task (loop ))
30553062 asyncio ._set_running_loop (None )
30563063
30573064 def test__unregister_task (self ):
@@ -3075,18 +3082,19 @@ class PyIntrospectionTests(test_utils.TestCase, BaseTaskIntrospectionTests):
30753082 _enter_task = staticmethod (tasks ._py_enter_task )
30763083 _leave_task = staticmethod (tasks ._py_leave_task )
30773084 all_tasks = staticmethod (tasks ._py_all_tasks )
3085+ current_task = staticmethod (tasks ._py_current_task )
30783086
30793087
30803088@unittest .skipUnless (hasattr (tasks , '_c_register_task' ),
30813089 'requires the C _asyncio module' )
3082- @unittest .skip ("skip" )
30833090class CIntrospectionTests (test_utils .TestCase , BaseTaskIntrospectionTests ):
30843091 if hasattr (tasks , '_c_register_task' ):
30853092 _register_task = staticmethod (tasks ._c_register_task )
30863093 _unregister_task = staticmethod (tasks ._c_unregister_task )
30873094 _enter_task = staticmethod (tasks ._c_enter_task )
30883095 _leave_task = staticmethod (tasks ._c_leave_task )
30893096 all_tasks = staticmethod (tasks ._c_all_tasks )
3097+ current_task = staticmethod (tasks ._c_current_task )
30903098 else :
30913099 _register_task = _unregister_task = _enter_task = _leave_task = None
30923100
0 commit comments