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

fix compilation errors caused by changes to wipe method 

This commit keeps the behavior the same and does not exclude the index audit trail template from
being wiped, that will be done in a future commit.

Original commit: elastic/x-pack-elasticsearch@1ac9e22923
This commit is contained in:
jaymode 2015-09-17 08:02:45 -04:00
parent d7f15b8999
commit 04178cbc30
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shield/src/test/java/org/elasticsearch/shield/audit/index/IndexAuditTrailTests.java
View File

@ -49,6 +49,7 @@ import org.junit.Test;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -211,9 +212,9 @@ public class IndexAuditTrailTests extends ShieldIntegTestCase {
auditor.close();
}
cluster().wipe();
cluster().wipe(Collections.<String>emptySet());
if (remoteIndexing && cluster2 != null) {
cluster2.wipe();
cluster2.wipe(Collections.emptySet());
remoteClient.close();
cluster2.close();
}

3
shield/src/test/java/org/elasticsearch/shield/audit/index/RemoteIndexAuditTrailStartingTests.java
View File

@ -20,6 +20,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@ -105,7 +106,7 @@ public class RemoteIndexAuditTrailStartingTests extends ShieldIntegTestCase {
public void stopRemoteCluster() throws Exception {
if (remoteCluster != null) {
try {
remoteCluster.wipe();
remoteCluster.wipe(Collections.<String>emptySet());
} finally {
remoteCluster.afterTest();
}