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

Isolate REST client single host tests (#30504) 

These tests are sharing the same server and client for every test. Yet,
we are seeing some tests fail with mysterious connection resets. It is
not clear what is happening but one theory is that the tests are
interfering with each other. This commit moves to use a separate server
and client per test.
This commit is contained in:
Jason Tedor 2018-05-10 07:58:02 -04:00 committed by GitHub
parent 84660ffd5f
commit 596b262b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java
View File

@ -35,7 +35,9 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.apache.http.nio.entity.NStringEntity; import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.elasticsearch.mocksocket.MockHttpServer; import org.elasticsearch.mocksocket.MockHttpServer;
import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import java.io.IOException; import java.io.IOException;
@ -69,20 +71,20 @@ import static org.junit.Assert.fail;
*/ */
public class RestClientSingleHostIntegTests extends RestClientTestCase { public class RestClientSingleHostIntegTests extends RestClientTestCase {
private static HttpServer httpServer; private HttpServer httpServer;
private static RestClient restClient; private RestClient restClient;
private static String pathPrefix; private String pathPrefix;
private static Header[] defaultHeaders; private Header[] defaultHeaders;
@BeforeClass @Before
public static void startHttpServer() throws Exception { public void startHttpServer() throws Exception {
pathPrefix = randomBoolean() ? "/testPathPrefix/" + randomAsciiLettersOfLengthBetween(1, 5) : ""; pathPrefix = randomBoolean() ? "/testPathPrefix/" + randomAsciiLettersOfLengthBetween(1, 5) : "";
httpServer = createHttpServer(); httpServer = createHttpServer();
defaultHeaders = RestClientTestUtil.randomHeaders(getRandom(), "Header-default"); defaultHeaders = RestClientTestUtil.randomHeaders(getRandom(), "Header-default");
restClient = createRestClient(false, true); restClient = createRestClient(false, true);
} }
private static HttpServer createHttpServer() throws Exception { private HttpServer createHttpServer() throws Exception {
HttpServer httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); HttpServer httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
httpServer.start(); httpServer.start();
//returns a different status code depending on the path //returns a different status code depending on the path
@ -127,7 +129,7 @@ public class RestClientSingleHostIntegTests extends RestClientTestCase {
} }
} }
private static RestClient createRestClient(final boolean useAuth, final boolean usePreemptiveAuth) { private RestClient createRestClient(final boolean useAuth, final boolean usePreemptiveAuth) {
// provide the username/password for every request // provide the username/password for every request
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider(); final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("user", "pass")); credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("user", "pass"));
@ -155,8 +157,8 @@ public class RestClientSingleHostIntegTests extends RestClientTestCase {
return restClientBuilder.build(); return restClientBuilder.build();
} }
@AfterClass @After
public static void stopHttpServers() throws IOException { public void stopHttpServers() throws IOException {
restClient.close(); restClient.close();
restClient = null; restClient = null;
httpServer.stop(0); httpServer.stop(0);