opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Make ElasticIndexIT tests fail if test container fails to start

Change-Id: I709c31cddf708026fc0478cb3fb7c9effb0e4fca
This commit is contained in:
David Pursehouse
2018-06-15 12:01:17 +09:00
parent 724fe0b7a4 65b93383af
commit a1bf56d101
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,8 @@ public class ElasticIndexIT extends AbstractIndexTests {
private static Config getConfig(ElasticVersion version) { private static Config getConfig(ElasticVersion version) {
ElasticNodeInfo elasticNodeInfo; ElasticNodeInfo elasticNodeInfo;
try { container = ElasticContainer.createAndStart(version);
container = ElasticContainer.createAndStart(version); elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
} catch (Throwable t) {
return null;
}
String indicesPrefix = UUID.randomUUID().toString(); String indicesPrefix = UUID.randomUUID().toString();
Config cfg = new Config(); Config cfg = new Config();
ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix); ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix);