From d5a44a64960e86eb8c483c204a7cb86278df2793 Mon Sep 17 00:00:00 2001 From: jaymode Date: Mon, 14 Sep 2015 09:34:19 -0400 Subject: [PATCH] test: use test cluster scope for remote index audit trail tests The SSL randomization can cause issues when running this test multiple times to look for an issue since the suite cluster may have a different SSL value than the remote cluster during subsequent runs. Closes elastic/elasticsearch#607 Original commit: elastic/x-pack-elasticsearch@8ba3140c52d88b8906d903a06092a1132a5ec898 --- .../shield/audit/index/RemoteIndexAuditTrailStartingTests.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shield/src/test/java/org/elasticsearch/shield/audit/index/RemoteIndexAuditTrailStartingTests.java b/shield/src/test/java/org/elasticsearch/shield/audit/index/RemoteIndexAuditTrailStartingTests.java index e725b820600..8da2485f471 100644 --- a/shield/src/test/java/org/elasticsearch/shield/audit/index/RemoteIndexAuditTrailStartingTests.java +++ b/shield/src/test/java/org/elasticsearch/shield/audit/index/RemoteIndexAuditTrailStartingTests.java @@ -9,6 +9,8 @@ import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.ShieldIntegTestCase; import org.elasticsearch.test.ShieldSettingsSource; @@ -28,6 +30,7 @@ import static org.hamcrest.Matchers.is; /** * This test checks to ensure that the IndexAuditTrail starts properly when indexing to a remote cluster */ +@ClusterScope(scope = Scope.TEST) public class RemoteIndexAuditTrailStartingTests extends ShieldIntegTestCase { public static final String SECOND_CLUSTER_NODE_PREFIX = "remote_" + SUITE_CLUSTER_NODE_PREFIX;