forked from pool/python-grpclib
Steve Kowalik
12a3f3d32b
* Support pytest-asyncio 1.0 changes. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-grpclib?expand=0&rev=5
102 lines
2.8 KiB
Diff
102 lines
2.8 KiB
Diff
From 2008de510c76c40dca9c175febfe14200f1f5fb5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Sat, 21 Jun 2025 07:14:42 +0200
|
|
Subject: [PATCH 1/3] Fix tests with pytest-asyncio >= 1.0.0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Update tests not to use the deprecated `event_loop` fixture that's
|
|
been removed in pytest-asyncio >= 1.0.0. Instead, use
|
|
`asyncio.get_running_loop()` as the recommended replacement. Make
|
|
the fixture `async` as well to make things work correctly.
|
|
|
|
This change is compatible both with `pytest-asyncio >= 1.0.0`
|
|
and `== 0.23.6`.
|
|
|
|
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
---
|
|
tests/conftest.py | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/conftest.py b/tests/conftest.py
|
|
index 6aef1a1..21159de 100644
|
|
--- a/tests/conftest.py
|
|
+++ b/tests/conftest.py
|
|
@@ -1,12 +1,14 @@
|
|
+import asyncio
|
|
+
|
|
import pytest
|
|
|
|
from grpclib.config import Configuration
|
|
|
|
|
|
@pytest.fixture(name='loop')
|
|
-def loop_fixture(event_loop):
|
|
+async def loop_fixture():
|
|
""" Shortcut """
|
|
- return event_loop
|
|
+ return asyncio.get_running_loop()
|
|
|
|
|
|
@pytest.fixture(name='config')
|
|
|
|
From 83497080efb91e24b34e35b6b1f208bee7125d0f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Sat, 28 Jun 2025 21:21:44 +0200
|
|
Subject: [PATCH 2/3] Use pytest_asyncio.fixture
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
---
|
|
tests/conftest.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/conftest.py b/tests/conftest.py
|
|
index 21159de..e569631 100644
|
|
--- a/tests/conftest.py
|
|
+++ b/tests/conftest.py
|
|
@@ -1,11 +1,12 @@
|
|
import asyncio
|
|
|
|
import pytest
|
|
+import pytest_asyncio
|
|
|
|
from grpclib.config import Configuration
|
|
|
|
|
|
-@pytest.fixture(name='loop')
|
|
+@pytest_asyncio.fixture(name='loop')
|
|
async def loop_fixture():
|
|
""" Shortcut """
|
|
return asyncio.get_running_loop()
|
|
|
|
From 35edfa12d0bb58f5d3cc2e277893b5c33a65eda8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Sat, 28 Jun 2025 21:22:16 +0200
|
|
Subject: [PATCH 3/3] Switch to pytest-asyncio strict mode
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
---
|
|
setup.cfg | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.cfg b/setup.cfg
|
|
index 06617b9..f54ae6e 100644
|
|
--- a/setup.cfg
|
|
+++ b/setup.cfg
|
|
@@ -48,7 +48,7 @@ grpclib =
|
|
[tool:pytest]
|
|
addopts = -q --tb=native
|
|
testpaths = tests
|
|
-asyncio_mode = auto
|
|
+asyncio_mode = strict
|
|
filterwarnings =
|
|
error
|
|
ignore:.*pkg_resources.*:DeprecationWarning
|