|
@@ -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"));
|
|
|
- }
|
|
|
}
|