diff options
| author | Damien George <damien@micropython.org> | 2024-07-18 10:03:28 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-07-18 11:08:48 +1000 |
| commit | fce3cea2440e0242fc4cf5c1825368795f540470 (patch) | |
| tree | f3d0e2510d0f4977b97d212bc42ce4af91184460 | |
| parent | b4b4d161c2fba54de7f4b297af66a2a807d62f98 (diff) | |
tests/extmod: Make get_event_loop tests compatible with CPython 3.12.
Follow up to 2e852522b178e6e9b2f0cdb954ba44aa9e7d7c0d: instead of having
.exp files for the get_event_loop tests, tweak them so they are compatible
with CPython 3.12. This requires calling `asyncio.set_event_loop()` so
there is an active event loop and `asyncio.get_event_loop()` succeeds
without a warning.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | tests/extmod/asyncio_get_event_loop.py | 6 | ||||
| -rw-r--r-- | tests/extmod/asyncio_get_event_loop.py.exp | 2 | ||||
| -rw-r--r-- | tests/extmod/asyncio_new_event_loop.py | 6 | ||||
| -rw-r--r-- | tests/extmod/asyncio_new_event_loop.py.exp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/extmod/asyncio_get_event_loop.py b/tests/extmod/asyncio_get_event_loop.py index bbc1a6b2d..6ecbb13b5 100644 --- a/tests/extmod/asyncio_get_event_loop.py +++ b/tests/extmod/asyncio_get_event_loop.py @@ -1,5 +1,4 @@ # Test get_event_loop() -# Note: CPython deprecated get_event_loop() so this test needs a .exp try: import asyncio @@ -7,6 +6,11 @@ except ImportError: print("SKIP") raise SystemExit +# CPython 3.12 deprecated calling get_event_loop() when there is no current event +# loop, so to make this test run on CPython requires setting the event loop. +if hasattr(asyncio, "set_event_loop"): + asyncio.set_event_loop(asyncio.new_event_loop()) + async def main(): print("start") diff --git a/tests/extmod/asyncio_get_event_loop.py.exp b/tests/extmod/asyncio_get_event_loop.py.exp deleted file mode 100644 index 5d0fb3b2d..000000000 --- a/tests/extmod/asyncio_get_event_loop.py.exp +++ /dev/null @@ -1,2 +0,0 @@ -start -end diff --git a/tests/extmod/asyncio_new_event_loop.py b/tests/extmod/asyncio_new_event_loop.py index 5bb31f129..bebc3bf70 100644 --- a/tests/extmod/asyncio_new_event_loop.py +++ b/tests/extmod/asyncio_new_event_loop.py @@ -1,5 +1,4 @@ # Test Loop.new_event_loop() -# Note: CPython deprecated get_event_loop() so this test needs a .exp try: import asyncio @@ -7,6 +6,11 @@ except ImportError: print("SKIP") raise SystemExit +# CPython 3.12 deprecated calling get_event_loop() when there is no current event +# loop, so to make this test run on CPython requires setting the event loop. +if hasattr(asyncio, "set_event_loop"): + asyncio.set_event_loop(asyncio.new_event_loop()) + async def task(): for i in range(4): diff --git a/tests/extmod/asyncio_new_event_loop.py.exp b/tests/extmod/asyncio_new_event_loop.py.exp deleted file mode 100644 index 9e104fda3..000000000 --- a/tests/extmod/asyncio_new_event_loop.py.exp +++ /dev/null @@ -1,6 +0,0 @@ -start -task 0 -stop -start -task 0 -stop |