From 2ebcdad7205ebb15e3ef09fbc5c932e251a59cac Mon Sep 17 00:00:00 2001 From: Issam El-atif Date: Fri, 31 May 2019 20:41:57 +0200 Subject: [PATCH] Fix tests --- .../coordination/JoinTaskExecutorTests.java | 3 +-- .../xpack/security/SecurityTests.java | 23 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java index b8168ce3de4a7..0225ffe8fe6cd 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java @@ -54,8 +54,7 @@ public void testPreventJoinClusterWithUnsupportedIndices() { Settings.builder().build(); MetaData.Builder metaBuilder = MetaData.builder(); IndexMetaData indexMetaData = IndexMetaData.builder("test") - .settings(settings(VersionUtils.getPreviousVersion(Version.CURRENT - .minimumIndexCompatibilityVersion()))) + .settings(settings(Version.fromString("6.8.0"))) // latest V6 released version .numberOfShards(1) .numberOfReplicas(1).build(); metaBuilder.put(indexMetaData, false); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java index 768bc38813c0b..47c686e0c87a2 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java @@ -318,29 +318,6 @@ public void testJoinValidatorForFIPSLicense() throws Exception { } } - public void testIndexJoinValidator_Old_And_Rolling() throws Exception { - createComponents(Settings.EMPTY); - BiConsumer joinValidator = security.getJoinValidator(); - assertNotNull(joinValidator); - Version version = VersionUtils.randomVersionBetween(random(), VersionUtils.getFirstVersion(), - VersionUtils.getPreviousVersion(Version.V_7_0_0)); - DiscoveryNode node = new DiscoveryNode("foo", buildNewFakeTransportAddress(), Version.CURRENT); - IndexMetaData indexMetaData = IndexMetaData.builder(SECURITY_MAIN_ALIAS) - .settings(settings(version) - .put(INDEX_FORMAT_SETTING.getKey(), INTERNAL_MAIN_INDEX_FORMAT - 1)) - .numberOfShards(1).numberOfReplicas(0) - .build(); - DiscoveryNode existingOtherNode = new DiscoveryNode("bar", buildNewFakeTransportAddress(), version); - DiscoveryNodes discoveryNodes = DiscoveryNodes.builder().add(existingOtherNode).build(); - ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT) - .nodes(discoveryNodes) - .metaData(MetaData.builder().put(indexMetaData, true).build()).build(); - IllegalStateException e = expectThrows(IllegalStateException.class, - () -> joinValidator.accept(node, clusterState)); - assertThat(e.getMessage(), equalTo("Security index is not on the current version [6] - " + - "The Upgrade API must be run for 7.x nodes to join the cluster")); - } - public void testIndexJoinValidator_FullyCurrentCluster() throws Exception { createComponents(Settings.EMPTY); BiConsumer joinValidator = security.getJoinValidator();