ingest: fix merge for backport of #36618

elastic · Dec 18, 2018 · d0b223a · d0b223a
1 parent e5f2c31
commit d0b223a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_default_pipeline.yml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_default_pipeline.yml
@@ -134,9 +134,9 @@ teardown:
       mget:
         body:
           docs:
-          - { _index: "test", _type: "_doc", _id: "6" }
-          - { _index: "test", _type: "_doc", _id: "7" }
-          - { _index: "test", _type: "_doc", _id: "8" }
+          - { _index: "test", _type: "test", _id: "6" }
+          - { _index: "test", _type: "test", _id: "7" }
+          - { _index: "test", _type: "test", _id: "8" }
   - match: { docs.0._index: "test" }
   - match: { docs.0._id: "6" }
   - match: { docs.0._source.bytes_source_field: "1kb" }

diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java
@@ -147,7 +147,7 @@ public void testGetIndexWriteRequest() throws Exception {
         assertEquals(TransportBulkAction.getIndexWriteRequest(docAsUpsertRequest), indexRequest);
         assertEquals(TransportBulkAction.getIndexWriteRequest(scriptedUpsert), indexRequest);
 
-        DeleteRequest deleteRequest = new DeleteRequest("index", "id");
+        DeleteRequest deleteRequest = new DeleteRequest("index", "type", "id");
         assertNull(TransportBulkAction.getIndexWriteRequest(deleteRequest));
 
         UpdateRequest badUpsertRequest = new UpdateRequest("index", "type", "id1");