dsl testing fixes

Author: miguelgrinberg

pyproject.toml

@@ -59,6 +59,7 @@ dev = [
     "aiohttp",
     "pytest",
     "pytest-cov",
+    "pytest-mock",
     "pytest-asyncio",
     "coverage",
     "jinja2",

test_elasticsearch/test_dsl/conftest.py

@@ -22,7 +22,7 @@
 import time
 from datetime import datetime
 from typing import Any, AsyncGenerator, Dict, Generator, Tuple, cast
-from unittest import SkipTest, TestCase
+from unittest import SkipTest
 from unittest.mock import AsyncMock, Mock
 
 import pytest_asyncio
@@ -53,81 +53,52 @@
     ELASTICSEARCH_URL = "http://localhost:9200"
 
 
-def get_test_client(wait: bool = True, **kwargs: Any) -> Elasticsearch:
+def get_test_client(url, wait: bool = True, **kwargs: Any) -> Elasticsearch:
     # construct kwargs from the environment
     kw: Dict[str, Any] = {"request_timeout": 30}
 
     if "PYTHON_CONNECTION_CLASS" in os.environ:
         kw["node_class"] = os.environ["PYTHON_CONNECTION_CLASS"]
 
     kw.update(kwargs)
-    client = Elasticsearch(ELASTICSEARCH_URL, **kw)
+    client = Elasticsearch(url, **kw)
+    return client
 
     # wait for yellow status
-    for tries_left in range(100 if wait else 1, 0, -1):
-        try:
-            client.cluster.health(wait_for_status="yellow")
-            return client
-        except ConnectionError:
-            if wait and tries_left == 1:
-                raise
-            time.sleep(0.1)
-
-    raise SkipTest("Elasticsearch failed to start.")
-
-
-async def get_async_test_client(wait: bool = True, **kwargs: Any) -> AsyncElasticsearch:
+    # for tries_left in range(100 if wait else 1, 0, -1):
+    #     try:
+    #         client.cluster.health(wait_for_status="yellow")
+    #         return client
+    #     except ConnectionError:
+    #         if wait and tries_left == 1:
+    #             raise
+    #         time.sleep(0.1)
+    #
+    # raise SkipTest("Elasticsearch failed to start.")
+
+
+async def get_async_test_client(
+    url, wait: bool = True, **kwargs: Any
+) -> AsyncElasticsearch:
     # construct kwargs from the environment
     kw: Dict[str, Any] = {"request_timeout": 30}
-
-    if "PYTHON_CONNECTION_CLASS" in os.environ:
-        kw["node_class"] = os.environ["PYTHON_CONNECTION_CLASS"]
-
     kw.update(kwargs)
-    client = AsyncElasticsearch(ELASTICSEARCH_URL, **kw)
-
-    # wait for yellow status
-    for tries_left in range(100 if wait else 1, 0, -1):
-        try:
-            await client.cluster.health(wait_for_status="yellow")
-            return client
-        except ConnectionError:
-            if wait and tries_left == 1:
-                raise
-            await asyncio.sleep(0.1)
-
+    client = AsyncElasticsearch(url, **kw)
+    yield client
     await client.close()
-    raise SkipTest("Elasticsearch failed to start.")
 
-
-class ElasticsearchTestCase(TestCase):
-    client: Elasticsearch
-
-    @staticmethod
-    def _get_client() -> Elasticsearch:
-        return get_test_client()
-
-    @classmethod
-    def setup_class(cls) -> None:
-        cls.client = cls._get_client()
-
-    def teardown_method(self, _: Any) -> None:
-        # Hidden indices expanded in wildcards in ES 7.7
-        expand_wildcards = ["open", "closed"]
-        if self.es_version() >= (7, 7):
-            expand_wildcards.append("hidden")
-
-        self.client.indices.delete_data_stream(
-            name="*", expand_wildcards=expand_wildcards
-        )
-        self.client.indices.delete(index="*", expand_wildcards=expand_wildcards)
-        self.client.indices.delete_template(name="*")
-        self.client.indices.delete_index_template(name="*")
-
-    def es_version(self) -> Tuple[int, ...]:
-        if not hasattr(self, "_es_version"):
-            self._es_version = _get_version(self.client.info()["version"]["number"])
-        return self._es_version
+    # wait for yellow status
+    # for tries_left in range(100 if wait else 1, 0, -1):
+    #     try:
+    #         await client.cluster.health(wait_for_status="yellow")
+    #         return client
+    #     except ConnectionError:
+    #         if wait and tries_left == 1:
+    #             raise
+    #         await asyncio.sleep(0.1)
+    #
+    # await client.close()
+    # raise SkipTest("Elasticsearch failed to start.")
 
 
 def _get_version(version_string: str) -> Tuple[int, ...]:
@@ -138,19 +109,23 @@ def _get_version(version_string: str) -> Tuple[int, ...]:
 
 
 @fixture(scope="session")
-def client() -> Elasticsearch:
+def client(elasticsearch_url) -> Elasticsearch:
     try:
-        connection = get_test_client(wait="WAIT_FOR_ES" in os.environ)
+        connection = get_test_client(
+            elasticsearch_url, wait="WAIT_FOR_ES" in os.environ
+        )
         add_connection("default", connection)
         return connection
     except SkipTest:
         skip()
 
 
 @pytest_asyncio.fixture
-async def async_client() -> AsyncGenerator[AsyncElasticsearch, None]:
+async def async_client(elasticsearch_url) -> AsyncGenerator[AsyncElasticsearch, None]:
     try:
-        connection = await get_async_test_client(wait="WAIT_FOR_ES" in os.environ)
+        connection = await get_async_test_client(
+            elasticsearch_url, wait="WAIT_FOR_ES" in os.environ
+        )
         add_async_connection("default", connection)
         yield connection
         await connection.close()