From 98a52c7c5c322274fa5e9a5ff4f9456b1ad7fb35 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 12 Nov 2025 19:50:12 +0400 Subject: [PATCH 1/2] 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) # Conflicts: # test_elasticsearch/test_async/test_server/conftest.py --- test_elasticsearch/test_async/test_server/conftest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test_elasticsearch/test_async/test_server/conftest.py b/test_elasticsearch/test_async/test_server/conftest.py index 623646e7d..0e011b59f 100644 --- a/test_elasticsearch/test_async/test_server/conftest.py +++ b/test_elasticsearch/test_async/test_server/conftest.py @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -import pytest import pytest_asyncio import elasticsearch @@ -43,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 From 1d192f1ac85b2cb842a085d4cdb578645c2d66d7 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 12 Nov 2025 20:00:26 +0400 Subject: [PATCH 2/2] Add missing import --- test_elasticsearch/test_async/test_server/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test_elasticsearch/test_async/test_server/conftest.py b/test_elasticsearch/test_async/test_server/conftest.py index 0e011b59f..90acae91a 100644 --- a/test_elasticsearch/test_async/test_server/conftest.py +++ b/test_elasticsearch/test_async/test_server/conftest.py @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. +import pytest import pytest_asyncio import elasticsearch