From be4ebfbf46afb43641f11cef7c8c1197b30d9924 Mon Sep 17 00:00:00 2001 From: Rory Hunter Date: Wed, 19 Aug 2020 09:39:04 +0100 Subject: [PATCH] Remove old test mute code (#61277) It seems that some old test mute code, added as part of #31498, was never removed. This meant that the HDFS tests would fail when run under JDK 11. --- .../hdfs/HdfsBlobStoreRepositoryTests.java | 1 - .../repositories/hdfs/HdfsRepositoryTests.java | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java index 4b4a315da88..a427cee8242 100644 --- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java +++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java @@ -39,7 +39,6 @@ public class HdfsBlobStoreRepositoryTests extends ESBlobStoreRepositoryIntegTest @Override protected Settings repositorySettings() { - assumeFalse("https://github.com/elastic/elasticsearch/issues/31498", HdfsRepositoryTests.isJava11()); return Settings.builder() .put("uri", "hdfs:///") .put("conf.fs.AbstractFileSystem.hdfs.impl", TestingFs.class.getName()) diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java index 05c339293ac..af1eb3805ec 100644 --- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java +++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.repositories.hdfs; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; import org.elasticsearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.SecureSettings; import org.elasticsearch.common.settings.Settings; @@ -46,16 +45,8 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase { return new MockSecureSettings(); } - @Override - public void tearDown() throws Exception { - if (isJava11() == false) { - super.tearDown(); - } - } - @Override protected void createRepository(String repoName) { - assumeFalse("https://github.com/elastic/elasticsearch/issues/31498", isJava11()); AcknowledgedResponse putRepositoryResponse = client().admin().cluster().preparePutRepository(repoName) .setType("hdfs") .setSettings(Settings.builder() @@ -77,8 +68,4 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase { assertThat(response.result().blobs(), equalTo(0L)); } } - - public static boolean isJava11() { - return JavaVersion.current().equals(JavaVersion.parse("11")); - } }