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.
elastic · Aug 19, 2020 · be4ebfb · be4ebfb
1 parent d4a8172
commit be4ebfb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/...-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java b/...-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java
@@ -39,7 +39,6 @@ protected String repositoryType() {
 
     @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/...epository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java b/...epository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java
@@ -21,7 +21,6 @@
 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 @@ protected SecureSettings credentials() {
         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 @@ protected void assertCleanupResponse(CleanupRepositoryResponse response, long by
             assertThat(response.result().blobs(), equalTo(0L));
         }
     }
-
-    public static boolean isJava11() {
-        return JavaVersion.current().equals(JavaVersion.parse("11"));
-    }
 }