Use client fixtures for mapbox tests (#2579)

* Use client fixtures for mapbox tests * Fix lint * Improve mapbox tests
elastic · Jun 6, 2024 · 8d381ac · 8d381ac
1 parent cd88015
commit 8d381ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/test_elasticsearch/test_async/test_server/test_helpers.py b/test_elasticsearch/test_async/test_server/test_helpers.py
@@ -350,11 +350,7 @@ async def test_errors_are_reported_correctly(self, async_client):
         assert "42" == error["index"]["_id"]
         assert "i" == error["index"]["_index"]
         print(error["index"]["error"])
-        assert error["index"]["error"]["type"] in [
-            "mapper_parsing_exception",
-            # Elasticsearch 8.8+: https://github.com/elastic/elasticsearch/pull/92646
-            "document_parsing_exception",
-        ]
+        assert error["index"]["error"]["type"] == "document_parsing_exception"
 
     async def test_error_is_raised(self, async_client):
         await async_client.indices.create(

diff --git a/test_elasticsearch/test_async/test_server/test_mapbox_vector_tile.py b/test_elasticsearch/test_async/test_server/test_mapbox_vector_tile.py
@@ -18,7 +18,7 @@
 import pytest
 import pytest_asyncio
 
-from elasticsearch import AsyncElasticsearch, RequestError
+from elasticsearch import RequestError
 
 pytestmark = pytest.mark.asyncio
 
@@ -74,9 +74,8 @@ async def mvt_setup(async_client):
     )
 
 
-async def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, ca_certs):
-    client = AsyncElasticsearch(elasticsearch_url, ca_certs=ca_certs)
-    await client.search_mvt(
+async def test_mapbox_vector_tile_error(async_client, mvt_setup):
+    await async_client.search_mvt(
         index="museums",
         zoom=13,
         x=4207,
@@ -85,7 +84,7 @@ async def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, ca_certs):
     )
 
     with pytest.raises(RequestError) as e:
-        await client.search_mvt(
+        await async_client.search_mvt(
             index="museums",
             zoom=-100,
             x=4207,
@@ -114,15 +113,13 @@ async def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, ca_certs):
     }
 
 
-async def test_mapbox_vector_tile_response(elasticsearch_url, mvt_setup, ca_certs):
+async def test_mapbox_vector_tile_response(async_client, mvt_setup):
     try:
         import mapbox_vector_tile
     except ImportError:
         return pytest.skip("Requires the 'mapbox-vector-tile' package")
 
-    client = AsyncElasticsearch(elasticsearch_url, ca_certs=ca_certs)
-
-    resp = await client.search_mvt(
+    resp = await async_client.search_mvt(
         index="museums",
         zoom=13,
         x=4207,

diff --git a/test_elasticsearch/test_server/test_helpers.py b/test_elasticsearch/test_server/test_helpers.py
@@ -337,11 +337,7 @@ def test_errors_are_reported_correctly(sync_client):
     assert "42" == error["index"]["_id"]
     assert "i" == error["index"]["_index"]
     print(error["index"]["error"])
-    assert error["index"]["error"]["type"] in [
-        "mapper_parsing_exception",
-        # Elasticsearch 8.8+: https://github.com/elastic/elasticsearch/pull/92646
-        "document_parsing_exception",
-    ]
+    assert error["index"]["error"]["type"] == "document_parsing_exception"
 
 
 def test_error_is_raised(sync_client):

diff --git a/test_elasticsearch/test_server/test_mapbox_vector_tile.py b/test_elasticsearch/test_server/test_mapbox_vector_tile.py
@@ -19,8 +19,6 @@
 
 from elasticsearch import RequestError
 
-from .conftest import _create
-
 
 @pytest.fixture(scope="function")
 def mvt_setup(sync_client):
@@ -73,11 +71,8 @@ def mvt_setup(sync_client):
     )
 
 
-@pytest.mark.parametrize("node_class", ["urllib3", "requests"])
-def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, node_class, ca_certs):
-    client = _create(elasticsearch_url, node_class=node_class)
-
-    client.search_mvt(
+def test_mapbox_vector_tile_error(sync_client, mvt_setup):
+    sync_client.search_mvt(
         index="museums",
         zoom=13,
         x=4207,
@@ -86,7 +81,7 @@ def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, node_class, ca_c
     )
 
     with pytest.raises(RequestError) as e:
-        client.search_mvt(
+        sync_client.search_mvt(
             index="museums",
             zoom=-100,
             x=4207,
@@ -115,18 +110,13 @@ def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, node_class, ca_c
     }
 
 
-@pytest.mark.parametrize("node_class", ["urllib3", "requests"])
-def test_mapbox_vector_tile_response(
-    elasticsearch_url, mvt_setup, node_class, ca_certs
-):
+def test_mapbox_vector_tile_response(sync_client, mvt_setup):
     try:
         import mapbox_vector_tile
     except ImportError:
         return pytest.skip("Requires the 'mapbox-vector-tile' package")
 
-    client = _create(elasticsearch_url, node_class=node_class)
-
-    resp = client.search_mvt(
+    resp = sync_client.search_mvt(
         index="museums",
         zoom=13,
         x=4207,