* stable-2.15: ElasticContainer: Upgrade to 6.8.2 image for V6_8 tests Fix typo: program Clarify usage of 'parent' option in list files API Remove unused Skylark patch file Files: Use Gerrit API to get revision parents Add support for Elasticsearch version 6.8.x Upgrade elasticsearch-rest-client to 7.2.1 CommitApi: Add method to get commit info Consolidate all CommitApi tests into a single class Files: Validate parent option to prevent internal server error RevisionIT: Assert that files(base) only works for patch set revisions Fix and expand documentation of REST API to get revision files RevisionIT#files: Simplify assertion Update git submodules Also update ElasticV6QueryProjectsTest to use V6_8. Change-Id: I98da65486f39acad509529ff90540d9f8ae00a2d
70 lines
2.3 KiB
Java
70 lines
2.3 KiB
Java
// Copyright (C) 2018 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
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;
|
|
import com.google.gerrit.testing.IndexConfig;
|
|
import com.google.inject.Guice;
|
|
import com.google.inject.Injector;
|
|
import org.eclipse.jgit.lib.Config;
|
|
import org.junit.AfterClass;
|
|
import org.junit.BeforeClass;
|
|
|
|
public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest {
|
|
@ConfigSuite.Default
|
|
public static Config defaultConfig() {
|
|
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;
|
|
}
|
|
|
|
container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
|
|
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
|
|
}
|
|
|
|
@AfterClass
|
|
public static void stopElasticsearchServer() {
|
|
if (container != null) {
|
|
container.stop();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void initAfterLifecycleStart() throws Exception {
|
|
super.initAfterLifecycleStart();
|
|
ElasticTestUtils.createAllIndexes(injector);
|
|
}
|
|
|
|
@Override
|
|
protected Injector createInjector() {
|
|
Config elasticsearchConfig = new Config(config);
|
|
InMemoryModule.setDefaults(elasticsearchConfig);
|
|
String indicesPrefix = getSanitizedMethodName();
|
|
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
|
|
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
|
|
}
|
|
}
|