Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Do not assume ES is running on localhost in tests
Simplify creation of Elasticsearch containers in tests
Add debug logs for automatic account creation case
Change-Id: I7046d6cf87282cc2b5a8dda6110cb3854b18bab0
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
index 43307c0..2c73149 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
@@ -24,18 +24,10 @@
import org.eclipse.jgit.lib.Config;
public final class ElasticTestUtils {
- public static class ElasticNodeInfo {
- public final String hostname;
- public final int port;
-
- public ElasticNodeInfo(String hostname, int port) {
- this.hostname = hostname;
- this.port = port;
- }
- }
-
public static void configure(
- Config config, String hostname, int port, String prefix, ElasticVersion version) {
+ Config config, ElasticContainer container, String prefix, ElasticVersion version) {
+ String hostname = container.getHttpHost().getHostName();
+ int port = container.getHttpHost().getPort();
config.setEnum("index", null, "type", IndexType.ELASTICSEARCH);
config.setString("elasticsearch", null, "server", "http://" + hostname + ":" + port);
config.setString("elasticsearch", null, "prefix", prefix);
@@ -46,8 +38,8 @@
}
}
- public static void configure(Config config, String hostname, int port, String prefix) {
- configure(config, hostname, port, prefix, null);
+ public static void configure(Config config, ElasticContainer container, String prefix) {
+ configure(config, container, prefix, null);
}
public static void createAllIndexes(Injector injector) {
@@ -60,12 +52,9 @@
public static Config getConfig(ElasticVersion version) {
ElasticContainer container = ElasticContainer.createAndStart(version);
- ElasticNodeInfo elasticNodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
String indicesPrefix = UUID.randomUUID().toString();
Config cfg = new Config();
- configure(cfg, elasticNodeInfo.hostname, elasticNodeInfo.port, indicesPrefix, version);
+ configure(cfg, container, indicesPrefix, version);
return cfg;
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
index cc9bcc1..e34fd21 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
index 9c6cb2b..1efaa7e 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.change.AbstractQueryChangesTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
index 9f8a6b5..3c20cf0 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
index 3e3bb57..4bf4067 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
index 8cbff5b..d4d321d 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
index f72661a..e840fb9 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.change.AbstractQueryChangesTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -36,23 +35,17 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
private static CloseableHttpAsyncClient client;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
+ client = HttpAsyncClients.createDefault();
+ client.start();
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
- client = HttpAsyncClients.createDefault();
- client.start();
}
@AfterClass
@@ -67,7 +60,10 @@
client.execute(
new HttpPost(
String.format(
- "http://localhost:%d/%s*/_close", nodeInfo.port, getSanitizedMethodName())),
+ "http://%s:%d/%s*/_close",
+ container.getHttpHost().getHostName(),
+ container.getHttpHost().getPort(),
+ getSanitizedMethodName())),
HttpClientContext.create(),
null);
}
@@ -83,8 +79,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
index 63689b7..99c07f4 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
index 3376622..89c7774 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
index 48a0d50..047e420 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index 6c83703..0cfdbfc 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.change.AbstractQueryChangesTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -36,23 +35,17 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
private static CloseableHttpAsyncClient client;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
+ client = HttpAsyncClients.createDefault();
+ client.start();
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
- client = HttpAsyncClients.createDefault();
- client.start();
}
@AfterClass
@@ -67,7 +60,10 @@
client.execute(
new HttpPost(
String.format(
- "http://localhost:%d/%s*/_close", nodeInfo.port, getSanitizedMethodName())),
+ "http://%s:%d/%s*/_close",
+ container.getHttpHost().getHostName(),
+ container.getHttpHost().getPort(),
+ getSanitizedMethodName())),
HttpClientContext.create(),
null);
}
@@ -83,8 +79,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
index 359f283..590a994 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
index 77a3291..cf12d96 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
@@ -14,7 +14,6 @@
package com.google.gerrit.elasticsearch;
-import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.InMemoryModule;
@@ -31,20 +30,14 @@
return IndexConfig.createForElasticsearch();
}
- private static ElasticNodeInfo nodeInfo;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {
- if (nodeInfo != null) {
- // do not start Elasticsearch twice
- return;
+ if (container == null) {
+ // Only start Elasticsearch once
+ container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
}
-
- container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo =
- new ElasticNodeInfo(
- container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -65,8 +58,7 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(elasticsearchConfig, container, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
