opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  ElasticIndexIT: replace member with local variable
  Elasticsearch tests: remove password duplication

Change-Id: I9d71a0f156621b8c528db979577bd7ebcaf9edaf
This commit is contained in:
David Pursehouse
2018-07-17 09:36:55 +09:00
parent 958a4a9493 7957f93c5b
commit de0488a5fb
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@@ -33,8 +33,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
String indicesPrefix = UUID.randomUUID().toString(); String indicesPrefix = UUID.randomUUID().toString();
Config cfg = new Config(); Config cfg = new Config();
String password = version == ElasticVersion.V5_6 ? "changeme" : null; ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version);
ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, password);
return cfg; return cfg;
} }

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@@ -24,16 +24,14 @@ import java.util.UUID;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
public class ElasticIndexIT extends AbstractIndexTests { public class ElasticIndexIT extends AbstractIndexTests {
private static ElasticContainer<?> container;
private static Config getConfig(ElasticVersion version) { private static Config getConfig(ElasticVersion version) {
ElasticNodeInfo elasticNodeInfo; ElasticNodeInfo elasticNodeInfo;
container = ElasticContainer.createAndStart(version); ElasticContainer<?> container = ElasticContainer.createAndStart(version);
elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
String indicesPrefix = UUID.randomUUID().toString(); String indicesPrefix = UUID.randomUUID().toString();
Config cfg = new Config(); Config cfg = new Config();
String password = version == ElasticVersion.V5_6 ? "changeme" : null; ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version);
ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, password);
return cfg; return cfg;
} }

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

@@ -32,11 +32,12 @@ public final class ElasticTestUtils {
} }
} }
public static void configure(Config config, int port, String prefix, String password) { public static void configure(Config config, int port, String prefix, ElasticVersion version) {
config.setEnum("index", null, "type", IndexType.ELASTICSEARCH); config.setEnum("index", null, "type", IndexType.ELASTICSEARCH);
config.setString("elasticsearch", null, "server", "http://localhost:" + port); config.setString("elasticsearch", null, "server", "http://localhost:" + port);
config.setString("elasticsearch", null, "prefix", prefix); config.setString("elasticsearch", null, "prefix", prefix);
config.setInt("index", null, "maxLimit", 10000); config.setInt("index", null, "maxLimit", 10000);
String password = version == ElasticVersion.V5_6 ? "changeme" : null;
if (password != null) { if (password != null) {
config.setString("elasticsearch", null, "password", password); config.setString("elasticsearch", null, "password", password);
} }

3
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
View File

@@ -60,7 +60,8 @@ public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest {
Config elasticsearchConfig = new Config(config); Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig); InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = testName(); String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix, "changeme"); ElasticTestUtils.configure(
elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
} }
} }

3
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
View File

@@ -60,7 +60,8 @@ public class ElasticV5QueryChangesTest extends AbstractQueryChangesTest {
Config elasticsearchConfig = new Config(config); Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig); InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = testName(); String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix, "changeme"); ElasticTestUtils.configure(
elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
} }
} }

3
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
View File

@@ -60,7 +60,8 @@ public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest {
Config elasticsearchConfig = new Config(config); Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig); InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = testName(); String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix, "changeme"); ElasticTestUtils.configure(
elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
} }
} }