Merge branch 'main' into requires-serverless

Author: pquentin

test_elasticsearch_serverless/test_async/test_server/test_clients.py

@@ -51,7 +51,21 @@ async def test_bulk_works_with_bytestring_body(async_client):
     docs = (
         b'{ "index" : { "_index" : "bulk_test_index", "_id" : "2" } }\n{"answer": 42}'
     )
-    response = await async_client.bulk(body=docs)
+    resp = await async_client.bulk(body=docs)
 
-    assert response["errors"] is False
-    assert len(response["items"]) == 1
+    assert resp["errors"] is False
+    assert len(resp["items"]) == 1
+
+    # Pop inconsistent items before asserting
+    resp["items"][0]["index"].pop("_id")
+    resp["items"][0]["index"].pop("_version")
+    resp["items"][0]["index"].pop("_shards")
+    assert resp["items"][0] == {
+        "index": {
+            "_index": "bulk_test_index",
+            "result": "created",
+            "_seq_no": 0,
+            "_primary_term": 1,
+            "status": 201,
+        }
+    }

test_elasticsearch_serverless/test_async/test_server/test_helpers.py

@@ -940,66 +940,6 @@ async def test_all_documents_get_moved(self, async_client, reindex_setup):
         )["_source"]
 
 
-@pytest_asyncio.fixture(scope="function")
-async def parent_reindex_setup(async_client):
-    body = {
-        "mappings": {
-            "properties": {
-                "question_answer": {
-                    "type": "join",
-                    "relations": {"question": "answer"},
-                }
-            }
-        },
-    }
-    await async_client.indices.create(index="test-index", body=body)
-    await async_client.indices.create(index="real-index", body=body)
-
-    await async_client.index(
-        index="test-index", id=42, body={"question_answer": "question"}
-    )
-    await async_client.index(
-        index="test-index",
-        id=47,
-        routing=42,
-        body={"some": "data", "question_answer": {"name": "answer", "parent": 42}},
-        refresh=True,
-    )
-
-
-class TestParentChildReindex:
-    async def test_children_are_reindexed_correctly(
-        self, async_client, parent_reindex_setup
-    ):
-        await helpers.async_reindex(async_client, "test-index", "real-index")
-
-        q = await async_client.get(index="real-index", id=42)
-        assert {
-            "_id": "42",
-            "_index": "real-index",
-            "_primary_term": 1,
-            "_seq_no": 0,
-            "_source": {"question_answer": "question"},
-            "_version": 1,
-            "found": True,
-        } == q
-
-        q = await async_client.get(index="test-index", id=47, routing=42)
-        assert {
-            "_routing": "42",
-            "_id": "47",
-            "_index": "test-index",
-            "_primary_term": 1,
-            "_seq_no": 1,
-            "_source": {
-                "some": "data",
-                "question_answer": {"name": "answer", "parent": 42},
-            },
-            "_version": 1,
-            "found": True,
-        } == q
-
-
 @pytest_asyncio.fixture(scope="function")
 async def reindex_data_stream_setup(async_client):
     dt = datetime.now(tz=timezone.utc)
@@ -1022,7 +962,7 @@ async def reindex_data_stream_setup(async_client):
             "data_stream": {},
         },
     )
-    await async_client.indices.create_data_stream(name="py-test-stream", refresh=True)
+    await async_client.indices.create_data_stream(name="py-test-stream")
     yield
 
 

test_elasticsearch_serverless/test_server/test_clients.py

@@ -55,11 +55,11 @@ def test_bulk_works_with_bytestring_body(sync_client):
     # Pop inconsistent items before asserting
     resp["items"][0]["index"].pop("_id")
     resp["items"][0]["index"].pop("_version")
+    resp["items"][0]["index"].pop("_shards")
     assert resp["items"][0] == {
         "index": {
             "_index": "bulk_test_index",
             "result": "created",
-            "_shards": {"total": 2, "successful": 1, "failed": 0},
             "_seq_no": 0,
             "_primary_term": 1,
             "status": 201,

test_elasticsearch_serverless/test_server/test_helpers.py

@@ -887,61 +887,6 @@ def test_all_documents_get_moved(sync_client):
     )["_source"]
 
 
-@pytest.fixture(scope="function")
-def parent_child_reindex_setup(sync_client):
-    body = {
-        "mappings": {
-            "properties": {
-                "question_answer": {
-                    "type": "join",
-                    "relations": {"question": "answer"},
-                }
-            }
-        },
-    }
-    sync_client.indices.create(index="test-index", body=body)
-    sync_client.indices.create(index="real-index", body=body)
-
-    sync_client.index(index="test-index", id=42, body={"question_answer": "question"})
-    sync_client.index(
-        index="test-index",
-        id=47,
-        routing=42,
-        body={"some": "data", "question_answer": {"name": "answer", "parent": 42}},
-        refresh=True,
-    )
-
-
-@pytest.mark.usefixtures("parent_child_reindex_setup")
-def test_children_are_reindexed_correctly(sync_client):
-    helpers.reindex(sync_client, "test-index", "real-index")
-
-    q = sync_client.get(index="real-index", id=42)
-    assert {
-        "_id": "42",
-        "_index": "real-index",
-        "_primary_term": 1,
-        "_seq_no": 0,
-        "_source": {"question_answer": "question"},
-        "_version": 1,
-        "found": True,
-    } == q
-    q = sync_client.get(index="test-index", id=47, routing=42)
-    assert {
-        "_routing": "42",
-        "_id": "47",
-        "_index": "test-index",
-        "_primary_term": 1,
-        "_seq_no": 1,
-        "_source": {
-            "some": "data",
-            "question_answer": {"name": "answer", "parent": 42},
-        },
-        "_version": 1,
-        "found": True,
-    } == q
-
-
 @pytest.fixture(scope="function")
 def reindex_data_stream_setup(sync_client):
     dt = datetime.now(tz=tz.UTC)