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

make integration tests work 

Original commit: elastic/x-pack-elasticsearch@379e705138
This commit is contained in:
jaymode 2015-07-09 09:41:23 -04:00
parent b1147e3cb3
commit d2d5e62230
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java
View File

@ -167,6 +167,13 @@ public abstract class ShieldIntegrationTest extends ElasticsearchIntegrationTest
.build();
}
@Override
protected Settings externalClusterClientSettings() {
return Settings.builder()
.put("shield.user", ShieldSettingsSource.DEFAULT_USER_NAME + ":" + ShieldSettingsSource.DEFAULT_PASSWORD)
.build();
}
/**
* Allows for us to get the system key that is being used for the cluster
* @return the system key bytes

2
src/test/java/org/elasticsearch/test/ShieldRestIT.java
View File

@ -11,12 +11,10 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import org.elasticsearch.test.rest.ElasticsearchRestTestCase;
import org.elasticsearch.test.rest.RestTestCandidate;
import org.elasticsearch.test.rest.parser.RestTestParseException;
import org.junit.Ignore;
import java.io.IOException;
/** Runs rest tests against external cluster */
@Ignore("not yet functional")
public class ShieldRestIT extends ShieldRestTestCase {
public ShieldRestIT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);