honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-16 09:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: stop audit trails, increase logging and time to wait for it to start

Browse Source 
See elastic/elasticsearch#3979

Original commit: elastic/x-pack-elasticsearch@79d559cb8f
This commit is contained in:
jaymode 2016-11-03 14:55:05 -04:00
parent 846b676127
commit 7cd3b8301b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/index/RemoteIndexAuditTrailStartingTests.java
View File

@ -14,6 +14,7 @@ import org.elasticsearch.test.ESIntegTestCase.Scope;
import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.InternalTestCluster;
import org.elasticsearch.test.SecurityIntegTestCase; import org.elasticsearch.test.SecurityIntegTestCase;
import org.elasticsearch.test.SecuritySettingsSource; import org.elasticsearch.test.SecuritySettingsSource;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.xpack.security.audit.AuditTrail; import org.elasticsearch.xpack.security.audit.AuditTrail;
import org.elasticsearch.xpack.security.audit.AuditTrailService; import org.elasticsearch.xpack.security.audit.AuditTrailService;
import org.junit.After; import org.junit.After;
@ -26,9 +27,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.elasticsearch.test.InternalTestCluster.clusterName; import static org.elasticsearch.test.InternalTestCluster.clusterName;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
/** /**
@ -38,6 +39,7 @@ import static org.hamcrest.Matchers.is;
* The cluster started by the integrations tests may also index into itself... * The cluster started by the integrations tests may also index into itself...
*/ */
@ClusterScope(scope = Scope.TEST) @ClusterScope(scope = Scope.TEST)
@TestLogging("org.elasticsearch.xpack.security.audit.index:TRACE")
public class RemoteIndexAuditTrailStartingTests extends SecurityIntegTestCase { public class RemoteIndexAuditTrailStartingTests extends SecurityIntegTestCase {
public static final String SECOND_CLUSTER_NODE_PREFIX = "remote_" + TEST_CLUSTER_NODE_PREFIX; public static final String SECOND_CLUSTER_NODE_PREFIX = "remote_" + TEST_CLUSTER_NODE_PREFIX;
@ -112,15 +114,15 @@ public class RemoteIndexAuditTrailStartingTests extends SecurityIntegTestCase {
numNodes, numNodes, numNodes, numNodes,
cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, getMockPlugins(), getClientWrapper()); cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, getMockPlugins(), getClientWrapper());
remoteCluster.beforeTest(random(), 0.5); remoteCluster.beforeTest(random(), 0.5);
assertNoTimeout(remoteCluster.client().admin().cluster().prepareHealth().setWaitForGreenStatus().get());
} }
@After @After
public void stopRemoteCluster() throws Exception { public void stopRemoteCluster() throws Exception {
if (remoteCluster != null) { if (remoteCluster != null) {
/*Iterable<IndexAuditTrail> auditTrails = internalCluster().getInstances(IndexAuditTrail.class); remoteCluster.getInstance(AuditTrailService.class).getAuditTrails().stream()
for (IndexAuditTrail auditTrail : auditTrails) { .filter(t -> t.name().equals(IndexAuditTrail.NAME))
auditTrail.close(); .forEach((auditTrail) -> ((IndexAuditTrail) auditTrail).stop());
}*/
try { try {
remoteCluster.wipe(Collections.<String>emptySet()); remoteCluster.wipe(Collections.<String>emptySet());
@ -131,12 +133,9 @@ public class RemoteIndexAuditTrailStartingTests extends SecurityIntegTestCase {
} }
// stop the index audit trail so that the shards aren't locked causing the test to fail // stop the index audit trail so that the shards aren't locked causing the test to fail
/*if (outputs.contains("index")) { internalCluster().getInstance(AuditTrailService.class).getAuditTrails().stream()
Iterable<IndexAuditTrail> auditTrails = internalCluster().getInstances(IndexAuditTrail.class); .filter(t -> t.name().equals(IndexAuditTrail.NAME))
for (IndexAuditTrail auditTrail : auditTrails) { .forEach((auditTrail) -> ((IndexAuditTrail) auditTrail).stop());
auditTrail.close();
}
}*/
} }
public void testThatRemoteAuditInstancesAreStarted() throws Exception { public void testThatRemoteAuditInstancesAreStarted() throws Exception {
@ -146,7 +145,7 @@ public class RemoteIndexAuditTrailStartingTests extends SecurityIntegTestCase {
assertTrue(auditTrail.isPresent()); assertTrue(auditTrail.isPresent());
IndexAuditTrail indexAuditTrail = (IndexAuditTrail)auditTrail.get(); IndexAuditTrail indexAuditTrail = (IndexAuditTrail)auditTrail.get();
awaitBusy(() -> indexAuditTrail.state() == IndexAuditTrail.State.STARTED, 2L, TimeUnit.SECONDS); awaitBusy(() -> indexAuditTrail.state() == IndexAuditTrail.State.STARTED);
assertThat(indexAuditTrail.state(), is(IndexAuditTrail.State.STARTED)); assertThat(indexAuditTrail.state(), is(IndexAuditTrail.State.STARTED));
} }
} }