Drop functionality from tests that isn't available in serverless

Author: JoshMock

test_elasticsearch_serverless/test_server/test_helpers.py

@@ -66,7 +66,7 @@ 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"
     ):
         assert ok
 
@@ -79,7 +79,6 @@ def test_bulk_all_errors_from_chunk_are_raised_on_failure(sync_client):
         index="i",
         body={
             "mappings": {"properties": {"a": {"type": "integer"}}},
-            "settings": {"number_of_shards": 1, "number_of_replicas": 0},
         },
     )
     sync_client.cluster.health(wait_for_status="yellow")
@@ -177,7 +176,6 @@ def test_bulk_rejected_documents_are_retried(sync_client):
     assert 3 == len(results)
     print(results)
     assert [True, True, True] == [r[0] for r in results]
-    sync_client.indices.refresh(index="i")
     res = sync_client.search(index="i")
     assert {"value": 3, "relation": "eq"} == res["hits"]["total"]
     assert 4 == failing_client._called
@@ -215,7 +213,6 @@ def test_bulk_rejected_documents_are_retried_when_bytes_or_string(
     )
     assert 3 == len(results)
     assert [True, True, True] == [r[0] for r in results]
-    sync_client.indices.refresh(index="i")
     res = sync_client.search(index="i")
     assert {"value": 3, "relation": "eq"} == res["hits"]["total"]
     assert 4 == failing_client._called
@@ -252,7 +249,6 @@ def test_bulk_rejected_documents_are_retried_at_most_max_retries_times(sync_clie
     )
     assert 3 == len(results)
     assert [False, True, True] == [r[0] for r in results]
-    sync_client.indices.refresh(index="i")
     res = sync_client.search(index="i")
     assert {"value": 2, "relation": "eq"} == res["hits"]["total"]
     assert 4 == failing_client._called
@@ -290,7 +286,7 @@ def streaming_bulk():
 
 def test_bulk_works_with_single_item(sync_client):
     docs = [{"answer": 42, "_id": 1}]
-    success, failed = helpers.bulk(sync_client, docs, index="test-index", refresh=True)
+    success, failed = helpers.bulk(sync_client, docs, index="test-index")
 
     assert 1 == success
     assert not failed
@@ -300,7 +296,7 @@ def test_bulk_works_with_single_item(sync_client):
 
 def test_all_documents_get_inserted(sync_client):
     docs = [{"answer": x, "_id": x} for x in range(100)]
-    success, failed = helpers.bulk(sync_client, docs, index="test-index", refresh=True)
+    success, failed = helpers.bulk(sync_client, docs, index="test-index")
 
     assert 100 == success
     assert not failed
@@ -311,7 +307,7 @@ def test_all_documents_get_inserted(sync_client):
 def test_stats_only_reports_numbers(sync_client):
     docs = [{"answer": x} for x in range(100)]
     success, failed = helpers.bulk(
-        sync_client, docs, index="test-index", refresh=True, stats_only=True
+        sync_client, docs, index="test-index", stats_only=True
     )
 
     assert 100 == success
@@ -323,7 +319,6 @@ def test_errors_are_reported_correctly(sync_client):
     sync_client.indices.create(
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
-        settings={"number_of_shards": 1, "number_of_replicas": 0},
     )
     sync_client.cluster.health(wait_for_status="yellow")
 
@@ -348,7 +343,6 @@ def test_error_is_raised(sync_client):
     sync_client.indices.create(
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
-        settings={"number_of_shards": 1, "number_of_replicas": 0},
     )
     sync_client.cluster.health(wait_for_status="yellow")
 
@@ -395,7 +389,6 @@ def test_errors_are_collected_properly(sync_client):
     sync_client.indices.create(
         index="i",
         mappings={"properties": {"a": {"type": "integer"}}},
-        settings={"number_of_shards": 1, "number_of_replicas": 0},
     )
     sync_client.cluster.health(wait_for_status="yellow")
 
@@ -442,7 +435,7 @@ def test_order_can_be_preserved(sync_client):
     for x in range(100):
         bulk.append({"index": {"_index": "test_index", "_id": x}})
         bulk.append({"answer": x, "correct": x == 42})
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
     docs = list(
         helpers.scan(
@@ -464,7 +457,7 @@ def test_all_documents_are_read(sync_client):
     for x in range(100):
         bulk.append({"index": {"_index": "test_index", "_id": x}})
         bulk.append({"answer": x, "correct": x == 42})
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
     docs = list(helpers.scan(sync_client, index="test_index", size=2))
 
@@ -479,7 +472,7 @@ def test_scroll_error(sync_client):
     for x in range(4):
         bulk.append({"index": {"_index": "test_index"}})
         bulk.append({"value": x})
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
     with patch.object(sync_client, "options", return_value=sync_client), patch.object(
         sync_client, "scroll"
@@ -699,7 +692,7 @@ def test_log_warning_on_shard_failures(sync_client):
     for x in range(4):
         bulk.append({"index": {"_index": "test_index"}})
         bulk.append({"value": x})
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
     with patch(
         "elasticsearch_serverless.helpers.actions.logger"
@@ -741,7 +734,7 @@ def test_clear_scroll(sync_client):
     for x in range(4):
         bulk.append({"index": {"_index": "test_index"}})
         bulk.append({"value": x})
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
     with patch.object(sync_client, "options", return_value=sync_client), patch.object(
         sync_client, "clear_scroll", wraps=sync_client.clear_scroll
@@ -840,7 +833,7 @@ def reindex_setup(sync_client):
                 "type": "answers" if x % 2 == 0 else "questions",
             }
         )
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
 
 
 @pytest.mark.usefixtures("reindex_setup")
@@ -850,7 +843,6 @@ def test_reindex_passes_kwargs_to_scan_and_bulk(sync_client):
         "test_index",
         "prod_index",
         scan_kwargs={"q": "type:answers"},
-        bulk_kwargs={"refresh": True},
     )
 
     assert sync_client.indices.exists(index="prod_index")
@@ -869,7 +861,6 @@ def test_reindex_accepts_a_query(sync_client):
         "prod_index",
         query={"query": {"bool": {"filter": {"term": {"type": "answers"}}}}},
     )
-    sync_client.indices.refresh()
 
     assert sync_client.indices.exists(index="prod_index")
     assert 50 == sync_client.count(index="prod_index", q="type:answers")["count"]
@@ -882,7 +873,6 @@ 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")
-    sync_client.indices.refresh()
 
     assert sync_client.indices.exists(index="prod_index")
     assert 50 == sync_client.count(index="prod_index", q="type:questions")["count"]
@@ -896,7 +886,6 @@ def test_all_documents_get_moved(sync_client):
 @pytest.fixture(scope="function")
 def parent_child_reindex_setup(sync_client):
     body = {
-        "settings": {"number_of_shards": 1, "number_of_replicas": 0},
         "mappings": {
             "properties": {
                 "question_answer": {
@@ -916,7 +905,6 @@ def parent_child_reindex_setup(sync_client):
         routing=42,
         body={"some": "data", "question_answer": {"name": "answer", "parent": 42}},
     )
-    sync_client.indices.refresh(index="test-index")
 
 
 @pytest.mark.usefixtures("parent_child_reindex_setup")
@@ -963,7 +951,7 @@ def reindex_data_stream_setup(sync_client):
                 "@timestamp": (dt - timedelta(days=x)).isoformat(),
             }
         )
-    sync_client.bulk(operations=bulk, refresh=True)
+    sync_client.bulk(operations=bulk)
     sync_client.indices.put_index_template(
         name="my-index-template",
         body={
@@ -972,7 +960,6 @@ def reindex_data_stream_setup(sync_client):
         },
     )
     sync_client.indices.create_data_stream(name="py-test-stream")
-    sync_client.indices.refresh()
 
 
 @pytest.mark.usefixtures("reindex_data_stream_setup")
@@ -985,7 +972,6 @@ def test_reindex_index_datastream(op_type, sync_client):
         query={"query": {"bool": {"filter": {"term": {"type": "answers"}}}}},
         op_type=op_type,
     )
-    sync_client.indices.refresh()
     assert sync_client.indices.exists(index="py-test-stream")
     assert 50 == sync_client.count(index="py-test-stream", q="type:answers")["count"]
 

test_elasticsearch_serverless/test_server/test_responses.py

@@ -17,7 +17,7 @@
 
 
 def test_text_response(sync_client):
-    resp = sync_client.cat.tasks()
+    resp = sync_client.cat.aliases()
     assert resp.meta.status == 200
     assert isinstance(resp.body, str)
     assert str(resp.body) == str(resp)