honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: more fixes due to upstream changes

Browse Source 
Original commit: elastic/x-pack-elasticsearch@92119d102c
This commit is contained in:
Martijn van Groningen 2015-08-31 12:29:38 +02:00
parent 0dbd13b67c
commit c81af81cd3
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shield/src/test/java/org/elasticsearch/shield/authc/pki/PkiAuthenticationTests.java
View File

@ -18,6 +18,7 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.node.Node;
import org.elasticsearch.shield.ShieldPlugin;
import org.elasticsearch.shield.transport.SSLClientAuth;
import org.elasticsearch.shield.transport.netty.ShieldNettyHttpServerTransport;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@ -140,7 +141,7 @@ public class PkiAuthenticationTests extends ShieldIntegTestCase {
.put("cluster.name", internalTestCluster().getClusterName());
builder.remove("shield.user");
builder.remove("request.headers.Authorization");
return TransportClient.builder().settings(builder).build();
return TransportClient.builder().settings(builder).addPlugin(ShieldPlugin.class).build();
}
private String getNodeUrl() {

6
watcher/src/test/java/org/elasticsearch/watcher/actions/ActionErrorIntegrationTests.java
View File

@ -43,10 +43,10 @@ public class ActionErrorIntegrationTests extends AbstractWatcherIntegrationTests
}
@Override
protected List<String> pluginTypes() {
return ImmutableList.<String>builder()
protected List<Class<? extends Plugin>> pluginTypes() {
return ImmutableList.<Class<? extends Plugin>>builder()
.addAll(super.pluginTypes())
.add(ErrorActionPlugin.class.getName())
.add(ErrorActionPlugin.class)
.build();
}

27
watcher/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java
View File

@ -67,10 +67,7 @@ import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
@ -118,17 +115,27 @@ public abstract class AbstractWatcherIntegrationTests extends ESIntegTestCase {
.build();
}
protected List<String> pluginTypes() {
List<String> types = new ArrayList<>();
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return pluginTypes();
}
@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return nodePlugins();
}
protected List<Class<? extends Plugin>> pluginTypes() {
List<Class<? extends Plugin>> types = new ArrayList<>();
if (timeWarped()) {
types.add(TimeWarpedWatcherPlugin.class.getName());
types.add(TimeWarpedWatcherPlugin.class);
} else {
types.add(WatcherPlugin.class.getName());
types.add(WatcherPlugin.class);
}
if (shieldEnabled) {
types.add(ShieldPlugin.class.getName());
types.add(ShieldPlugin.class);
}
types.add(licensePluginClass().getName());
types.add(licensePluginClass());
return types;
}

2
watcher/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java
View File

@ -70,7 +70,7 @@ public class NoMasterNodeTests extends AbstractWatcherIntegrationTests {
@Override
protected Settings nodeSettings(int nodeOrdinal) {
Settings settings = super.nodeSettings(nodeOrdinal);
Settings unicastSettings = config.node(nodeOrdinal);
Settings unicastSettings = config.nodeSettings(nodeOrdinal);
return Settings.builder()
.put(settings)
.put(unicastSettings)