Merge pull request #18168 from vespa-engine/jonmv/vespa-feed-client

Document API errors are BAD_GATEWAY

1 files changed, 5 insertions, 4 deletions

diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 6f1b0466350..a0f6fd45dd8 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -330,6 +330,7 @@ public class DocumentV1ApiTest {
         assertEquals(400, response.getStatus());
 
         // DELETE with namespace and document type is a restricted visit which deletes visited documents.
+        // When visiting fails fatally, a 502 BAD GATEWAY is returned.
         access.expect(tokens.subList(0, 1));
         access.expect(parameters -> {
             assertEquals("(false) and (music) and (id.namespace=='space')", parameters.getDocumentSelection());
@@ -351,7 +352,7 @@ public class DocumentV1ApiTest {
                        "  \"pathId\": \"/document/v1/space/music/docid\"," +
                        "  \"message\": \"boom\"" +
                        "}", response.readAll());
-        assertEquals(500, response.getStatus());
+        assertEquals(502, response.getStatus());
 
         // DELETE at the root is also a deletion visit. These also require a selection.
         access.expect(parameters -> {
@@ -386,7 +387,7 @@ public class DocumentV1ApiTest {
                        "  \"documents\": []," +
                        "  \"message\": \"error\"" +
                        "}", response.readAll());
-        assertEquals(500, response.getStatus());
+        assertEquals(502, response.getStatus());
 
         // GET with namespace, document type and number is a restricted visit.
         access.expect(parameters -> {
@@ -649,12 +650,12 @@ public class DocumentV1ApiTest {
                        "  \"pathId\": \"/document/v1/space/music/number/1/two\"," +
                        "  \"message\": \"error\"" +
                        "}", response1.readAll());
-        assertEquals(500, response1.getStatus());
+        assertEquals(502, response1.getStatus());
         assertSameJson("{" +
                        "  \"pathId\": \"/document/v1/space/music/number/1/two\"," +
                        "  \"message\": \"error\"" +
                        "}", response2.readAll());
-        assertEquals(500, response2.getStatus());
+        assertEquals(502, response2.getStatus());
 
         // Request response does not arrive before timeout has passed.
         AtomicReference<ResponseHandler> handler = new AtomicReference<>();