github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Test: Make rest test framework accept http directly for the test cluster

Browse source 
The rest test framework, because it used to be tightly integrated with
ESIntegTestCase, currently expects the addresses for the test cluster to
be passed using the transport protocol port. However, it only uses this
to then find the http address.

This change makes ESRestTestCase extend from ESTestCase instead of
ESIntegTestCase, and changes the sysprop used to tests.rest.cluster,
which now takes the http address.

closes #15459
This commit is contained in:
Ryan Ernst 2016-01-18 16:39:59 -08:00
parent b6c9eaa24a
commit ef4f0a8699
33 changed files with 100 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/store-smb/src/test/java/org/elasticsearch/index/store/SMBStoreRestIT.java
View file

@ -21,22 +21,14 @@ package org.elasticsearch.index.store;
import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import org.elasticsearch.plugin.store.smb.SMBStorePlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.test.rest.RestTestCandidate;
import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
import java.util.Collection;
public class SMBStoreRestIT extends ESRestTestCase {
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return pluginList(SMBStorePlugin.class);
}
public SMBStoreRestIT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}