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

mute TribeTests and remove license plugin from transportClientPlugins 

See elastic/elasticsearch#551

Original commit: elastic/x-pack-elasticsearch@1d2ba3fc0e
This commit is contained in:
jaymode 2015-08-31 08:24:05 -04:00
parent 1786e8eb10
commit fb11827f78
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shield/src/test/java/org/elasticsearch/shield/tribe/TribeTests.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.shield.tribe;
import com.google.common.collect.ImmutableMap;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.cluster.node.DiscoveryNode;
@ -36,6 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
import static org.hamcrest.Matchers.*;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/551")
public class TribeTests extends ShieldIntegTestCase {
//use known suite prefix since their threads are already ignored via ElasticsearchThreadFilter

3
shield/src/test/java/org/elasticsearch/test/ShieldSettingsSource.java
View File

@ -28,6 +28,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomBoolean;
import static org.elasticsearch.common.settings.Settings.settingsBuilder;
@ -147,7 +148,7 @@ public class ShieldSettingsSource extends ClusterDiscoveryConfiguration.UnicastZ
@Override
public Collection<Class<? extends Plugin>> transportClientPlugins() {
return nodePlugins();
return Collections.<Class<? extends Plugin>>singletonList(ShieldPlugin.class);
}
protected String configUsers() {