diff options
author | Marco Miller <marco.mmiller@gmail.com> | 2018-12-04 16:24:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-04 16:24:23 +0000 |
commit | f0e1ce25557e78916493173ba83caf30f2c4082a (patch) | |
tree | 650dd19900dda93ca83c5cc4e559ff43b754d915 | |
parent | 4978ae51f372fa513d55634448d8701b95ec73f2 (diff) | |
parent | b9d00d08759f03f921599eb59e4c78ff0095ab06 (diff) |
Merge "ElasticV7QueryChangesTest: Close indices after test" into stable-2.15
-rw-r--r-- | gerrit-elasticsearch/BUILD | 5 | ||||
-rw-r--r-- | gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 18 |
2 files changed, 22 insertions, 1 deletions
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD index b91419a317..ce474cc835 100644 --- a/gerrit-elasticsearch/BUILD +++ b/gerrit-elasticsearch/BUILD @@ -101,7 +101,10 @@ ELASTICSEARCH_TAGS = [ size = "large", srcs = [src], tags = ELASTICSEARCH_TAGS, - deps = ELASTICSEARCH_DEPS, + deps = ELASTICSEARCH_DEPS + [ + "//lib/httpcomponents:httpasyncclient", + "//lib/httpcomponents:httpclient", + ], ) for name, src in ELASTICSEARCH_TESTS_V7.items()] junit_tests( diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 6d3bca2de2..f46364e918 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -19,7 +19,12 @@ import com.google.gerrit.server.query.change.AbstractQueryChangesTest; import com.google.gerrit.testutil.InMemoryModule; import com.google.inject.Guice; import com.google.inject.Injector; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; +import org.apache.http.impl.nio.client.HttpAsyncClients; import org.eclipse.jgit.lib.Config; +import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -27,6 +32,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { private static ElasticNodeInfo nodeInfo; private static ElasticContainer container; + private static CloseableHttpAsyncClient client; @BeforeClass public static void startIndexService() { @@ -37,6 +43,8 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { container = ElasticContainer.createAndStart(ElasticVersion.V7_0); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + client = HttpAsyncClients.createDefault(); + client.start(); } @AfterClass @@ -46,6 +54,16 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { } } + @After + public void closeIndex() { + client.execute( + new HttpPost( + String.format( + "http://localhost:%d/%s*/_close", nodeInfo.port, getSanitizedMethodName())), + HttpClientContext.create(), + null); + } + @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); |