From 9be952e54b77b77130d812db0ece41f390f3fc64 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 12 Nov 2025 19:50:12 +0400 Subject: [PATCH] Fix pytest 9 error (#3152) * Fix pytest 9 error * Use explicit pytest_asyncio fixture * Revert "Fix pytest 9 error" This reverts commit 019e7471624a7a335baff11e47e1754e87add3fc. * Fix lint * Fix lint better * Add back type ignore (cherry picked from commit 3a15e1bdc523f0a385398c6c9678fcc30386926e) --- test_elasticsearch/test_async/test_server/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test_elasticsearch/test_async/test_server/conftest.py b/test_elasticsearch/test_async/test_server/conftest.py index b96811d58..b9a859684 100644 --- a/test_elasticsearch/test_async/test_server/conftest.py +++ b/test_elasticsearch/test_async/test_server/conftest.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -import pytest +import pytest_asyncio import sniffio import elasticsearch @@ -23,7 +23,7 @@ from ...utils import CA_CERTS, wipe_cluster -@pytest.fixture(scope="function") +@pytest_asyncio.fixture(scope="function") async def async_client_factory(elasticsearch_url): kwargs = {} if sniffio.current_async_library() == "trio": @@ -42,7 +42,7 @@ async def async_client_factory(elasticsearch_url): await client.close() -@pytest.fixture(scope="function") +@pytest_asyncio.fixture(scope="function") def async_client(async_client_factory): try: yield async_client_factory