Fix async server tests

Author: sethmlarson

test_elasticsearch/test_async/test_server/test_clients.py

@@ -39,15 +39,15 @@ async def test_indices_analyze_unicode(async_client, kwargs):
     }
 
 
-async def test_bulk_works_with_string_body(self, async_client):
+async def test_bulk_works_with_string_body(async_client):
     docs = '{ "index" : { "_index" : "bulk_test_index", "_id" : "1" } }\n{"answer": 42}'
     response = await async_client.bulk(body=docs)
 
     assert response["errors"] is False
     assert len(response["items"]) == 1
 
 
-async def test_bulk_works_with_bytestring_body(self, async_client):
+async def test_bulk_works_with_bytestring_body(async_client):
     docs = (
         b'{ "index" : { "_index" : "bulk_test_index", "_id" : "2" } }\n{"answer": 42}'
     )

test_elasticsearch/test_async/test_server/test_helpers.py

@@ -123,11 +123,9 @@ def sync_gen():
 
     async def test_all_errors_from_chunk_are_raised_on_failure(self, async_client):
         await async_client.indices.create(
-            "i",
-            {
-                "mappings": {"properties": {"a": {"type": "integer"}}},
-                "settings": {"number_of_shards": 1, "number_of_replicas": 0},
-            },
+            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,11 +332,9 @@ async def test_stats_only_reports_numbers(self, async_client):
 
     async def test_errors_are_reported_correctly(self, async_client):
         await async_client.indices.create(
-            "i",
-            {
-                "mappings": {"properties": {"a": {"type": "integer"}}},
-                "settings": {"number_of_shards": 1, "number_of_replicas": 0},
-            },
+            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")
 
@@ -360,11 +356,9 @@ async def test_errors_are_reported_correctly(self, async_client):
 
     async def test_error_is_raised(self, async_client):
         await async_client.indices.create(
-            "i",
-            {
-                "mappings": {"properties": {"a": {"type": "integer"}}},
-                "settings": {"number_of_shards": 1, "number_of_replicas": 0},
-            },
+            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")
 
@@ -406,11 +400,9 @@ async def test_ignore_error_if_raised(self, async_client):
 
     async def test_errors_are_collected_properly(self, async_client):
         await async_client.indices.create(
-            "i",
-            {
-                "mappings": {"properties": {"a": {"type": "integer"}}},
-                "settings": {"number_of_shards": 1, "number_of_replicas": 0},
-            },
+            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")
 
@@ -867,7 +859,7 @@ async def test_reindex_passes_kwargs_to_scan_and_bulk(
             bulk_kwargs={"refresh": True},
         )
 
-        assert await async_client.indices.exists("prod_index")
+        assert await async_client.indices.exists(index="prod_index")
         assert (
             50
             == (await async_client.count(index="prod_index", q="type:answers"))["count"]
@@ -886,7 +878,7 @@ async def test_reindex_accepts_a_query(self, async_client, reindex_setup):
         )
         await async_client.indices.refresh()
 
-        assert await async_client.indices.exists("prod_index")
+        assert await async_client.indices.exists(index="prod_index")
         assert (
             50
             == (await async_client.count(index="prod_index", q="type:answers"))["count"]
@@ -900,7 +892,7 @@ async def test_all_documents_get_moved(self, async_client, reindex_setup):
         await helpers.async_reindex(async_client, "test_index", "prod_index")
         await async_client.indices.refresh()
 
-        assert await async_client.indices.exists("prod_index")
+        assert await async_client.indices.exists(index="prod_index")
         assert (
             50
             == (await async_client.count(index="prod_index", q="type:questions"))[