Clean up linter

Author: JoshMock

test_elasticsearch_serverless/test_async/test_server/test_helpers.py

@@ -921,7 +921,12 @@ async def test_reindex_accepts_a_query(self, async_client, reindex_setup):
         )["_source"]
 
     async def test_all_documents_get_moved(self, async_client, reindex_setup):
-        await helpers.async_reindex(async_client, "test_index", "prod_index", bulk_kwargs={"refresh": True})
+        await helpers.async_reindex(
+            async_client,
+            "test_index",
+            "prod_index",
+            bulk_kwargs={"refresh": "wait_for"},
+        )
 
         assert await async_client.indices.exists(index="prod_index")
         assert (

test_elasticsearch_serverless/test_server/conftest.py

@@ -36,15 +36,13 @@ def sync_client_factory(elasticsearch_url, elasticsearch_api_key):
     try:
         # Configure the client with API key and optionally
         # an HTTP conn class depending on 'PYTHON_CONNECTION_CLASS' envvar
-        kw = {'api_key': elasticsearch_api_key}
+        kw = {"api_key": elasticsearch_api_key}
         if "PYTHON_CONNECTION_CLASS" in os.environ:
             kw["node_class"] = os.environ["PYTHON_CONNECTION_CLASS"]
 
         # We do this little dance with the URL to force
         # Requests to respect 'headers: None' within rest API spec tests.
-        client = elasticsearch_serverless.Elasticsearch(
-            elasticsearch_url, **kw
-        )
+        client = elasticsearch_serverless.Elasticsearch(elasticsearch_url, **kw)
 
         # Wipe the cluster before we start testing just in case it wasn't wiped
         # cleanly from the previous run of pytest?

test_elasticsearch_serverless/test_server/test_helpers.py

@@ -66,7 +66,10 @@ def test_bulk_actions_remain_unchanged(sync_client):
 def test_bulk_all_documents_get_inserted(sync_client):
     docs = [{"answer": x, "_id": x} for x in range(100)]
     for ok, item in helpers.streaming_bulk(
-        sync_client, docs, index="test-index", refresh=True,
+        sync_client,
+        docs,
+        index="test-index",
+        refresh=True,
     ):
         assert ok
 
@@ -873,7 +876,9 @@ def test_reindex_accepts_a_query(sync_client):
 
 @pytest.mark.usefixtures("reindex_setup")
 def test_all_documents_get_moved(sync_client):
-    helpers.reindex(sync_client, "test_index", "prod_index", bulk_kwargs={"refresh": True})
+    helpers.reindex(
+        sync_client, "test_index", "prod_index", bulk_kwargs={"refresh": True}
+    )
 
     assert sync_client.indices.exists(index="prod_index")
     assert 50 == sync_client.count(index="prod_index", q="type:questions")["count"]

test_elasticsearch_serverless/test_server/test_rest_api_spec.py

@@ -42,7 +42,7 @@
 from elasticsearch_serverless._sync.client.utils import _base64_auth_header
 from elasticsearch_serverless.compat import string_types
 
-from ..utils import es_api_key, es_url, parse_version
+from ..utils import es_api_key, es_url
 
 # some params had to be changed in python, keep track of them so we can rename
 # those in the tests accordingly
@@ -546,10 +546,12 @@ def remove_implicit_resolver(cls, tag_to_remove):
     package_zip = zipfile.ZipFile(
         io.BytesIO(
             http.request(
-                "GET", yaml_tests_url, headers={
+                "GET",
+                yaml_tests_url,
+                headers={
                     "Authorization": f"Bearer {github_token}",
                     "Accept": "application/vnd.github+json",
-                }
+                },
             ).data
         )
     )
@@ -615,6 +617,7 @@ def _pytest_param_sort_key(param: pytest.param) -> Tuple[Union[str, int], ...]:
 YAML_TEST_SPECS = sorted(YAML_TEST_SPECS, key=_pytest_param_sort_key)
 
 if not RUN_ASYNC_REST_API_TESTS:
+
     @pytest.mark.parametrize("test_spec", YAML_TEST_SPECS)
     def test_rest_api_spec(test_spec, sync_runner):
         if test_spec.get("skip", False):