opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I99a05df36ed273bb0af6c670d329a9e95a3505da
This commit is contained in:
David Pursehouse
2018-06-15 08:17:44 +09:00
parent f1cc5e8107 99e8250b81
commit 4306a7ceea
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/pgm/ElasticReindexIT.java
View File

@@ -29,12 +29,8 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Default @ConfigSuite.Default
public static Config elasticsearch() { public static Config elasticsearch() {
ElasticNodeInfo elasticNodeInfo; ElasticNodeInfo elasticNodeInfo;
try { container = ElasticContainer.createAndStart();
container = ElasticContainer.createAndStart(); 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);