honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

delegate 

Original commit: elastic/x-pack-elasticsearch@5999c5d17b
This commit is contained in:
Martijn van Groningen 2015-08-31 12:58:03 +02:00
parent c81af81cd3
commit 677cf7e573
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java
View File

@ -179,7 +179,6 @@ public abstract class ShieldIntegTestCase extends ESIntegTestCase {
@Override
protected Settings externalClusterClientSettings() {
return Settings.builder()
.put("plugin.types", ShieldPlugin.class.getName())
.put("shield.user", ShieldSettingsSource.DEFAULT_USER_NAME + ":" + ShieldSettingsSource.DEFAULT_PASSWORD)
.build();
}
@ -294,7 +293,6 @@ public abstract class ShieldIntegTestCase extends ESIntegTestCase {
return ShieldIntegTestCase.this.nodeClientPassword();
}
@Override
protected String transportClientUsername() {
return ShieldIntegTestCase.this.transportClientUsername();
@ -310,6 +308,16 @@ public abstract class ShieldIntegTestCase extends ESIntegTestCase {
return ShieldIntegTestCase.this.licensePluginClass();
}
@Override
public Collection<Class<? extends Plugin>> nodePlugins() {
return ShieldIntegTestCase.this.nodePlugins();
}
@Override
public Collection<Class<? extends Plugin>> transportClientPlugins() {
return ShieldIntegTestCase.this.transportClientPlugins();
}
@Override
protected String licensePluginName() {
return ShieldIntegTestCase.this.licensePluginName();