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

fixed compile error due to upstream change 

Original commit: elastic/x-pack-elasticsearch@70a16e125c
This commit is contained in:
Martijn van Groningen 2015-08-31 21:28:35 +02:00
parent 90d0cb22ac
commit 5900a65085
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ public class IndexAuditTrailTests extends ShieldIntegTestCase {
return builder.build(); return builder.build();
} }
}; };
cluster2 = new InternalTestCluster("network", randomLong(), createTempDir(), numNodes, numNodes, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX); cluster2 = new InternalTestCluster("network", randomLong(), createTempDir(), numNodes, numNodes, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, true);
cluster2.beforeTest(getRandom(), 0.5); cluster2.beforeTest(getRandom(), 0.5);
remoteClient = cluster2.client(); remoteClient = cluster2.client();

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

@ -88,7 +88,7 @@ public class RemoteIndexAuditTrailStartingTests extends ShieldIntegTestCase {
return builder.build(); return builder.build();
} }
}; };
remoteCluster = new InternalTestCluster("network", randomLong(), createTempDir(), numNodes, numNodes, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX); remoteCluster = new InternalTestCluster("network", randomLong(), createTempDir(), numNodes, numNodes, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, true);
remoteCluster.beforeTest(getRandom(), 0.5); remoteCluster.beforeTest(getRandom(), 0.5);
} }

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

@ -64,7 +64,7 @@ public class TribeTests extends ShieldIntegTestCase {
String cluster2Name = clusterName(Scope.SUITE.name(), randomLong()); String cluster2Name = clusterName(Scope.SUITE.name(), randomLong());
//no port conflicts as this test uses the global cluster and a suite cluster that gets manually created //no port conflicts as this test uses the global cluster and a suite cluster that gets manually created
ShieldSettingsSource cluster2SettingsSource = new ShieldSettingsSource(2, sslTransportEnabled, systemKey(), createTempDir(), Scope.SUITE); ShieldSettingsSource cluster2SettingsSource = new ShieldSettingsSource(2, sslTransportEnabled, systemKey(), createTempDir(), Scope.SUITE);
cluster2 = new InternalTestCluster("network", randomLong(), createTempDir(), 2, 2, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX); cluster2 = new InternalTestCluster("network", randomLong(), createTempDir(), 2, 2, cluster2Name, cluster2SettingsSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, true);
assert tribeSettingsSource == null; assert tribeSettingsSource == null;
//given the low (2 and 1) number of nodes that the 2 SUITE clusters will have, we are not going to have port conflicts //given the low (2 and 1) number of nodes that the 2 SUITE clusters will have, we are not going to have port conflicts
@ -142,7 +142,7 @@ public class TribeTests extends ShieldIntegTestCase {
//we need to recreate the tribe node after each test otherwise ensureClusterSizeConsistency barfs //we need to recreate the tribe node after each test otherwise ensureClusterSizeConsistency barfs
String tribeClusterName = clusterName(Scope.SUITE.name(), randomLong()); String tribeClusterName = clusterName(Scope.SUITE.name(), randomLong());
tribeNodeCluster = new InternalTestCluster("network", randomLong(), createTempDir(), 1, 1, tribeClusterName, tribeSettingsSource, 0, false, TRIBE_CLUSTER_NODE_PREFIX); tribeNodeCluster = new InternalTestCluster("network", randomLong(), createTempDir(), 1, 1, tribeClusterName, tribeSettingsSource, 0, false, TRIBE_CLUSTER_NODE_PREFIX, true);
tribeNodeCluster.beforeTest(getRandom(), 0.5); tribeNodeCluster.beforeTest(getRandom(), 0.5);
awaitSameNodeCounts(); awaitSameNodeCounts();
} }