tests: Rename uasyncio to asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2023-06-08 16:01:38 +10:00 committed by Damien George
parent 2fbc08c462
commit 6027c41c8f
81 changed files with 136 additions and 244 deletions

View File

@ -1,13 +1,10 @@
# Test that tasks return their value correctly to the caller
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def foo():

View File

@ -1,11 +1,8 @@
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
import time

View File

@ -1,11 +1,8 @@
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def forever():

View File

@ -2,13 +2,10 @@
# That tasks which continuously cancel each other don't take over the scheduler
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(id, other):

View File

@ -2,13 +2,10 @@
# That tasks which keeps being cancelled by multiple other tasks gets a chance to run
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task_a():

View File

@ -1,13 +1,10 @@
# Test a task cancelling itself (currently unsupported)
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task():

View File

@ -1,13 +1,10 @@
# Test cancelling a task
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(s, allow_cancel):

View File

@ -1,13 +1,10 @@
# Test cancelling a task that is waiting on a task that just finishes.
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def sleep_task():

View File

@ -1,13 +1,10 @@
# Test current_task() function
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(result):

View File

@ -1,13 +1,10 @@
# Test Event class
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(id, ev):

View File

@ -2,13 +2,10 @@
# That tasks which continuously wait on events don't take over the scheduler
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task1(id):

View File

@ -1,13 +1,10 @@
# Test general exception handling
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
# main task raising an exception

View File

@ -1,13 +1,10 @@
# Test fairness of scheduler
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(id, t):

View File

@ -1,13 +1,10 @@
# test uasyncio.gather() function
# test asyncio.gather() function
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def factorial(name, number):

View File

@ -1,13 +1,10 @@
# Test uasyncio.gather() function, features that are not implemented.
# Test asyncio.gather() function, features that are not implemented.
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
def custom_handler(loop, context):

View File

@ -1,13 +1,10 @@
# Test get_event_loop()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def main():

View File

@ -1,6 +1,6 @@
# test that the following do not use the heap:
# - basic scheduling of tasks
# - uasyncio.sleep_ms
# - asyncio.sleep_ms
# - StreamWriter.write, stream is blocked and data to write is a bytes object
# - StreamWriter.write, when stream is not blocked
@ -25,13 +25,10 @@ except RuntimeError:
raise SystemExit
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
class TestStream:

View File

@ -1,13 +1,10 @@
# Test Lock class
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task_loop(id, lock):

View File

@ -1,13 +1,10 @@
# Test that locks work when cancelling multiple waiters on the lock
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(i, lock, lock_flag):

View File

@ -1,13 +1,10 @@
# Test Loop.stop() to stop the event loop
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task():

View File

@ -3,7 +3,7 @@
# - wait_for_ms
try:
import time, uasyncio
import time, asyncio
except ImportError:
print("SKIP")
raise SystemExit
@ -11,7 +11,7 @@ except ImportError:
async def task(id, t):
print("task start", id)
await uasyncio.sleep_ms(t)
await asyncio.sleep_ms(t)
print("task end", id)
return id * 2
@ -19,25 +19,25 @@ async def task(id, t):
async def main():
# Simple sleep_ms
t0 = time.ticks_ms()
await uasyncio.sleep_ms(1)
await asyncio.sleep_ms(1)
print(time.ticks_diff(time.ticks_ms(), t0) < 100)
try:
# Sleep 1ms beyond maximum allowed sleep value
await uasyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
await asyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
except OverflowError:
print("OverflowError")
# When task finished before the timeout
print(await uasyncio.wait_for_ms(task(1, 5), 50))
print(await asyncio.wait_for_ms(task(1, 5), 50))
# When timeout passes and task is cancelled
try:
print(await uasyncio.wait_for_ms(task(2, 50), 5))
except uasyncio.TimeoutError:
print(await asyncio.wait_for_ms(task(2, 50), 5))
except asyncio.TimeoutError:
print("timeout")
print("finish")
uasyncio.run(main())
asyncio.run(main())

View File

@ -1,13 +1,10 @@
# Test Loop.new_event_loop()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task():

View File

@ -1,13 +1,10 @@
# Test that tasks return their value correctly to the caller
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
def custom_handler(loop, context):

View File

@ -1,13 +1,10 @@
# Test the Task.done() method
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(t, exc=None):

View File

@ -1,7 +1,7 @@
# Test Event class
try:
import uasyncio as asyncio
import asyncio
except ImportError:
print("SKIP")
raise SystemExit

View File

@ -1,13 +1,10 @@
# Test asyncio.wait_for
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def task(id, t):

View File

@ -1,13 +1,10 @@
# Test asyncio.wait_for, with forwarding cancellation
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def awaiting(t, return_if_fail):

View File

@ -1,13 +1,10 @@
# Test waiting on a task
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
import time

View File

@ -102,7 +102,7 @@ def instance0():
# Client
def instance1():
try:
import uasyncio as asyncio
import asyncio
from aioespnow import AIOESPNow
except ImportError:
print("SKIP")

View File

@ -58,7 +58,7 @@ async def echo_server(e):
# Server
def instance0():
try:
import uasyncio as asyncio
import asyncio
from aioespnow import AIOESPNow
except ImportError:
print("SKIP")

View File

@ -1,13 +1,10 @@
# Test TCP server with client issuing TCP RST part way through read
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
import struct, time, socket

View File

@ -1,13 +1,10 @@
# Test uasyncio TCP stream closing then writing
# Test asyncio TCP stream closing then writing
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
PORT = 8000

View File

@ -1,13 +1,10 @@
# Test uasyncio stream read(-1) method using TCP server/client
# Test asyncio stream read(-1) method using TCP server/client
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
PORT = 8000

View File

@ -1,13 +1,10 @@
# Test uasyncio stream readexactly() method using TCP server/client
# Test asyncio stream readexactly() method using TCP server/client
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
PORT = 8000

View File

@ -1,13 +1,10 @@
# Test uasyncio stream readinto() method using TCP server/client
# Test asyncio stream readinto() method using TCP server/client
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
try:
import array

View File

@ -1,13 +1,10 @@
# Test uasyncio TCP server and client using start_server() and open_connection()
# Test asyncio TCP server and client using start_server() and open_connection()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
PORT = 8000

View File

@ -1,13 +1,10 @@
# Test basic behaviour of uasyncio.start_server()
# Test basic behaviour of asyncio.start_server()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def test():

View File

@ -1,13 +1,10 @@
# Test cancelling a task waiting on stream IO
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def get(reader):

View File

@ -1,13 +1,10 @@
# Test simple HTTP request with uasyncio.open_connection()
# Test simple HTTP request with asyncio.open_connection()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def http_get(url):

View File

@ -1,13 +1,10 @@
# Test uasyncio.open_connection() and stream readline()
# Test asyncio.open_connection() and stream readline()
try:
import uasyncio as asyncio
import asyncio
except ImportError:
try:
import asyncio
except ImportError:
print("SKIP")
raise SystemExit
print("SKIP")
raise SystemExit
async def http_get_headers(url):

View File

@ -624,10 +624,10 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
skip_tests.add("basics/sys_tracebacklimit.py") # requires traceback info
skip_tests.add("basics/try_finally_return2.py") # requires raise_varargs
skip_tests.add("basics/unboundlocal.py") # requires checking for unbound local
skip_tests.add("extmod/uasyncio_event.py") # unknown issue
skip_tests.add("extmod/uasyncio_lock.py") # requires async with
skip_tests.add("extmod/uasyncio_micropython.py") # unknown issue
skip_tests.add("extmod/uasyncio_wait_for.py") # unknown issue
skip_tests.add("extmod/asyncio_event.py") # unknown issue
skip_tests.add("extmod/asyncio_lock.py") # requires async with
skip_tests.add("extmod/asyncio_micropython.py") # unknown issue
skip_tests.add("extmod/asyncio_wait_for.py") # unknown issue
skip_tests.add("misc/features.py") # requires raise_varargs
skip_tests.add(
"misc/print_exception.py"
@ -672,7 +672,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
is_set_type = test_name.startswith(("set_", "frozenset")) or test_name.endswith("_set")
is_slice = test_name.find("slice") != -1 or test_name in misc_slice_tests
is_async = test_name.startswith(("async_", "uasyncio_"))
is_async = test_name.startswith(("async_", "asyncio_"))
is_const = test_name.startswith("const")
is_io_module = test_name.startswith("io_")
is_fstring = test_name.startswith("string_fstring")

View File

@ -50,7 +50,7 @@ RuntimeError:
ame__
port
builtins micropython _thread _uasyncio
builtins micropython _asyncio _thread
array binascii btree cexample
cmath collections cppexample cryptolib
errno example_package ffi