opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Update ES configuration in tests
  Update git submodules

Change-Id: Idcb1889e08bfa28bbcc94ac0fb0f70cda7214f1b
This commit is contained in:
David Pursehouse
2017-04-28 10:43:40 +02:00
parent 9288100fe3 cfd4bc5642
commit 78c4343e77
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java
View File

@@ -68,10 +68,9 @@ final class ElasticTestUtils {
static void configure(Config config, String port) {
config.setEnum("index", null, "type", IndexType.ELASTICSEARCH);
config.setString("index", null, "protocol", "http");
config.setString("index", null, "hostname", "localhost");
config.setString("index", null, "port", port);
config.setBoolean("index", "elasticsearch", "test", true);
config.setString("elasticsearch", "test", "protocol", "http");
config.setString("elasticsearch", "test", "hostname", "localhost");
config.setString("elasticsearch", "test", "port", port);
}
static ElasticNodeInfo startElasticsearchNode() throws InterruptedException, ExecutionException {