Clean up more unusable functionality from tests

Author: JoshMock

test_elasticsearch_serverless/test_async/test_server/test_helpers.py

@@ -125,7 +125,6 @@ async def test_all_errors_from_chunk_are_raised_on_failure(self, async_client):
         await async_client.indices.create(
             index="i",
             mappings={"properties": {"a": {"type": "integer"}}},
-            settings={"number_of_shards": 1, "number_of_replicas": 0},
         )
         await async_client.cluster.health(wait_for_status="yellow")
 
@@ -334,7 +333,6 @@ async def test_errors_are_reported_correctly(self, async_client):
         await async_client.indices.create(
             index="i",
             mappings={"properties": {"a": {"type": "integer"}}},
-            settings={"number_of_shards": 1, "number_of_replicas": 0},
         )
         await async_client.cluster.health(wait_for_status="yellow")
 
@@ -358,7 +356,6 @@ async def test_error_is_raised(self, async_client):
         await async_client.indices.create(
             index="i",
             mappings={"properties": {"a": {"type": "integer"}}},
-            settings={"number_of_shards": 1, "number_of_replicas": 0},
         )
         await async_client.cluster.health(wait_for_status="yellow")
 
@@ -402,7 +399,6 @@ async def test_errors_are_collected_properly(self, async_client):
         await async_client.indices.create(
             index="i",
             mappings={"properties": {"a": {"type": "integer"}}},
-            settings={"number_of_shards": 1, "number_of_replicas": 0},
         )
         await async_client.cluster.health(wait_for_status="yellow")
 
@@ -947,7 +943,6 @@ async def test_all_documents_get_moved(self, async_client, reindex_setup):
 @pytest.fixture(scope="function")
 async def parent_reindex_setup(async_client):
     body = {
-        "settings": {"number_of_shards": 1, "number_of_replicas": 0},
         "mappings": {
             "properties": {
                 "question_answer": {

test_elasticsearch_serverless/test_async/test_server/test_mapbox_vector_tile.py

@@ -73,8 +73,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)
+async def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup):
+    client = AsyncElasticsearch(elasticsearch_url)
     await client.search_mvt(
         index="museums",
         zoom=13,
@@ -113,13 +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(elasticsearch_url, 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)
+    client = AsyncElasticsearch(elasticsearch_url)
 
     resp = await client.search_mvt(
         index="museums",

test_elasticsearch_serverless/test_server/test_helpers.py

@@ -81,7 +81,6 @@ def test_bulk_all_errors_from_chunk_are_raised_on_failure(sync_client):
             "mappings": {"properties": {"a": {"type": "integer"}}},
         },
     )
-    sync_client.cluster.health(wait_for_status="yellow")
 
     try:
         for ok, _ in helpers.streaming_bulk(
@@ -323,7 +322,6 @@ def test_errors_are_reported_correctly(sync_client):
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
     )
-    sync_client.cluster.health(wait_for_status="yellow")
 
     success, failed = helpers.bulk(
         sync_client,
@@ -347,7 +345,6 @@ def test_error_is_raised(sync_client):
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
     )
-    sync_client.cluster.health(wait_for_status="yellow")
 
     with pytest.raises(helpers.BulkIndexError):
         helpers.bulk(
@@ -393,7 +390,6 @@ def test_errors_are_collected_properly(sync_client):
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
     )
-    sync_client.cluster.health(wait_for_status="yellow")
 
     success, failed = helpers.bulk(
         sync_client,

test_elasticsearch_serverless/test_server/test_mapbox_vector_tile.py

@@ -71,8 +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 = Elasticsearch(elasticsearch_url, node_class=node_class, ca_certs=ca_certs)
+def test_mapbox_vector_tile_error(elasticsearch_url, mvt_setup, node_class):
+    client = Elasticsearch(elasticsearch_url, node_class=node_class)
     client.search_mvt(
         index="museums",
         zoom=13,
@@ -113,14 +113,14 @@ 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
+    elasticsearch_url, mvt_setup, node_class
 ):
     try:
         import mapbox_vector_tile
     except ImportError:
         return pytest.skip("Requires the 'mapbox-vector-tile' package")
 
-    client = Elasticsearch(elasticsearch_url, node_class=node_class, ca_certs=ca_certs)
+    client = Elasticsearch(elasticsearch_url, node_class=node_class)
 
     resp = client.search_mvt(
         index="museums",