From 4cc9b81f8ae078a07bd9e24ed78cf3593ffca592 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 14 Oct 2025 13:07:15 +0800 Subject: [PATCH 1/2] tests: update to trio 0.31.0 The version of anyio that currently gets pulled in through asyncdbus is incompatible with trio: File "/home/jk/devel/mctp/mctp/venv/lib/python3.11/site-packages/anyio/_backends/_trio.py", line 141, in cancel self.__original.cancel(reason) File "/home/jk/devel/mctp/mctp/venv/lib/python3.11/site-packages/trio/_core/_ki.py", line 183, in wrapper return fn(*args, **kwargs) ^^^^^^^^^^^^^^^^^^^ TypeError: CancelScope.cancel() takes 1 positional argument but 2 were given With the breaking change at https://github.com/agronholm/anyio/commit/b2c933cd . Bump trio to 0.31 to support cancel reasons. Signed-off-by: Jeremy Kerr --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 9e726f3..f46f09d 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,5 +2,5 @@ asyncdbus==0.6.1 pyroute2==0.7.10 pytest==8.3.2 pytest-trio==0.8.0 -trio==0.26.2 +trio==0.31.0 pytest-tap==3.5 From e9988db831673840a09a229b6ff9491be290bad0 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 14 Oct 2025 13:09:46 +0800 Subject: [PATCH 2/2] github: upload test log as an artifact meson's stdout doesn't capture actual failure reasons, so store the log as well. Signed-off-by: Jeremy Kerr --- .github/workflows/pr.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b1a966b..19f8335 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -29,6 +29,11 @@ jobs: - name: Test mctp run: meson test -C build --verbose + - uses: actions/upload-artifact@v4 + with: + name: default-meson-testlog + path: build/meson-logs/testlog.txt + no-libsystemd: runs-on: ubuntu-latest steps: @@ -53,3 +58,8 @@ jobs: - name: Test mctp run: meson test -C build --verbose + + - uses: actions/upload-artifact@v4 + with: + name: no-libsystemd-meson-testlog + path: build/meson-logs/testlog.txt