From e911e09ac5cf77969b67b2e68284ce14c7386eae52083b09dda5ad5daf630135 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 2 Aug 2021 17:38:20 +0000 Subject: [PATCH] Accepting request 909824 from home:dspinella:branches:devel:languages:python - Add patch to fix uasyncio_heaplock test * fix-uasyncio_heaplock-test.patch OBS-URL: https://build.opensuse.org/request/show/909824 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/micropython?expand=0&rev=7 --- fix-uasyncio_heaplock-test.patch | 47 ++++++++++++++++++++++++++++++++ micropython.changes | 6 ++++ micropython.spec | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 fix-uasyncio_heaplock-test.patch diff --git a/fix-uasyncio_heaplock-test.patch b/fix-uasyncio_heaplock-test.patch new file mode 100644 index 0000000..9e79290 --- /dev/null +++ b/fix-uasyncio_heaplock-test.patch @@ -0,0 +1,47 @@ +From 180c54d6cc4e744082f7f76f484646db47d25adb Mon Sep 17 00:00:00 2001 +From: Damien George +Date: Fri, 25 Jun 2021 11:09:31 +1000 +Subject: [PATCH] tests/extmod: Make uasyncio_heaplock test more deterministic. + +This helps the test pass on systems with an inaccurate sleep time. + +Signed-off-by: Damien George +--- + tests/extmod/uasyncio_heaplock.py | 6 +++--- + tests/extmod/uasyncio_heaplock.py.exp | 2 -- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/uasyncio_heaplock.py +index 771d3f0d97a..3a92d36c9f5 100644 +--- a/tests/extmod/uasyncio_heaplock.py ++++ b/tests/extmod/uasyncio_heaplock.py +@@ -29,15 +29,15 @@ async def task(id, n, t): + + + async def main(): +- t1 = asyncio.create_task(task(1, 4, 10)) +- t2 = asyncio.create_task(task(2, 4, 25)) ++ t1 = asyncio.create_task(task(1, 4, 20)) ++ t2 = asyncio.create_task(task(2, 2, 50)) + + micropython.heap_lock() + + print("start") + await asyncio.sleep_ms(1) + print("sleep") +- await asyncio.sleep_ms(100) ++ await asyncio.sleep_ms(70) + print("finish") + + micropython.heap_unlock() +diff --git a/tests/extmod/uasyncio_heaplock.py.exp b/tests/extmod/uasyncio_heaplock.py.exp +index a967cc31971..68c6366c6f1 100644 +--- a/tests/extmod/uasyncio_heaplock.py.exp ++++ b/tests/extmod/uasyncio_heaplock.py.exp +@@ -6,6 +6,4 @@ sleep + 1 2 + 2 1 + 1 3 +-2 2 +-2 3 + finish diff --git a/micropython.changes b/micropython.changes index 6e6f68a..109cdb7 100644 --- a/micropython.changes +++ b/micropython.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 2 15:11:39 UTC 2021 - Danilo Spinella + +- Add patch to fix uasyncio_heaplock test + * fix-uasyncio_heaplock-test.patch + ------------------------------------------------------------------- Tue Jul 27 14:51:40 UTC 2021 - Matej Cepl diff --git a/micropython.spec b/micropython.spec index 5cc53b7..31c8e01 100644 --- a/micropython.spec +++ b/micropython.spec @@ -24,6 +24,7 @@ License: MIT Group: Development/Languages/Python URL: https://micropython.org/ Source: https://micropython.org/resources/source/%{name}-%{version}.tar.xz +Patch0: fix-uasyncio_heaplock-test.patch BuildRequires: openssl BuildRequires: python3 BuildRequires: readline-devel @@ -36,6 +37,7 @@ A lean and efficient Python implementation for microcontrollers and constrained %prep %setup -q +%patch0 -p1 sed -i -e "s:/usr/lib/micropython:%{_prefix}/lib/micropython:g" "ports/unix/main.c" %define make_flags V=1 MICROPY_PY_BTREE=0 MICROPY_PY_USSL=0