honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix client test to not care about complete error response message

This commit is contained in:
Ryan Ernst 2017-02-02 20:03:44 -08:00
parent 365d33efe3
commit 91cd6f35ce
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java
View File

@ -19,6 +19,9 @@
package org.elasticsearch.http; package org.elasticsearch.http;
import java.io.IOException;
import java.util.Collections;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException; import org.elasticsearch.client.ResponseException;
@ -27,9 +30,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.ESIntegTestCase.Scope;
import java.io.IOException; import static org.hamcrest.Matchers.containsString;
import java.util.Collections;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
/** /**
@ -48,14 +49,12 @@ public class DetailedErrorsDisabledIT extends HttpSmokeTestCase {
} }
public void testThatErrorTraceParamReturns400() throws IOException { public void testThatErrorTraceParamReturns400() throws IOException {
try { ResponseException e = expectThrows(ResponseException.class, () ->
getRestClient().performRequest("DELETE", "/", Collections.singletonMap("error_trace", "true")); getRestClient().performRequest("DELETE", "/", Collections.singletonMap("error_trace", "true")));
fail("request should have failed");
} catch(ResponseException e) {
Response response = e.getResponse(); Response response = e.getResponse();
assertThat(response.getHeader("Content-Type"), is("application/json; charset=UTF-8")); assertThat(response.getHeader("Content-Type"), is("application/json; charset=UTF-8"));
assertThat(EntityUtils.toString(e.getResponse().getEntity()), is("{\"error\":\"error traces in responses are disabled.\"}")); assertThat(EntityUtils.toString(e.getResponse().getEntity()), containsString("\"error\":\"error traces in responses are disabled.\""));
assertThat(response.getStatusLine().getStatusCode(), is(400)); assertThat(response.getStatusLine().getStatusCode(), is(400));
} }
} }
}