session loop

Author: maxjakob

test_elasticsearch/_async/conftest.py

@@ -17,6 +17,7 @@
 
 from typing import Tuple
 
+import asyncio
 import pytest
 import pytest_asyncio
 
@@ -25,6 +26,13 @@
 from .cluster import CA_CERTS, es_url, es_version
 
 
+@pytest.fixture(scope="session")
+def event_loop():
+    loop = asyncio.get_event_loop()
+    yield loop
+    loop.close()
+
+
 @pytest_asyncio.fixture(scope="session")
 async def elasticsearch_url():
     try:

test_elasticsearch/_async/test_server/conftest.py

@@ -17,8 +17,6 @@
 
 import os
 
-import asyncio
-import pytest
 import pytest_asyncio
 
 from elasticsearch import AsyncElasticsearch
@@ -54,15 +52,8 @@ def _create(elasticsearch_url, transport=None, node_class=None):
     return AsyncElasticsearch(elasticsearch_url, **kw)
 
 
-@pytest.fixture(scope="function")
-def event_loop():
-    loop = asyncio.get_event_loop()
-    yield loop
-    loop.close()
-
-
 @pytest_asyncio.fixture(scope="function")
-async def client_factory(elasticsearch_url, event_loop):
+async def client_factory(elasticsearch_url):
     client = None
     try:
         client = _create(elasticsearch_url)
@@ -77,7 +68,7 @@ async def client_factory(elasticsearch_url, event_loop):
 
 
 @pytest_asyncio.fixture(scope="function")
-async def es_client(client_factory, event_loop):
+async def es_client(client_factory):
     try:
         yield client_factory
     finally: