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

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.
This commit is contained in:
Rory Hunter 2020-08-19 09:39:04 +01:00 committed by Rory Hunter
parent d4a8172f8e
commit be4ebfbf46
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java
View File

@ -39,7 +39,6 @@ public class HdfsBlobStoreRepositoryTests extends ESBlobStoreRepositoryIntegTest
@Override @Override
protected Settings repositorySettings() { protected Settings repositorySettings() {
assumeFalse("https://github.com/elastic/elasticsearch/issues/31498", HdfsRepositoryTests.isJava11());
return Settings.builder() return Settings.builder()
.put("uri", "hdfs:///") .put("uri", "hdfs:///")
.put("conf.fs.AbstractFileSystem.hdfs.impl", TestingFs.class.getName()) .put("conf.fs.AbstractFileSystem.hdfs.impl", TestingFs.class.getName())

13
plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.repositories.hdfs;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.elasticsearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse; import org.elasticsearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse;
import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.bootstrap.JavaVersion;
import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.MockSecureSettings;
import org.elasticsearch.common.settings.SecureSettings; import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -46,16 +45,8 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase {
return new MockSecureSettings(); return new MockSecureSettings();
} }
@Override
public void tearDown() throws Exception {
if (isJava11() == false) {
super.tearDown();
}
}
@Override @Override
protected void createRepository(String repoName) { protected void createRepository(String repoName) {
assumeFalse("https://github.com/elastic/elasticsearch/issues/31498", isJava11());
AcknowledgedResponse putRepositoryResponse = client().admin().cluster().preparePutRepository(repoName) AcknowledgedResponse putRepositoryResponse = client().admin().cluster().preparePutRepository(repoName)
.setType("hdfs") .setType("hdfs")
.setSettings(Settings.builder() .setSettings(Settings.builder()
@ -77,8 +68,4 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase {
assertThat(response.result().blobs(), equalTo(0L)); assertThat(response.result().blobs(), equalTo(0L));
} }
} }
public static boolean isJava11() {
return JavaVersion.current().equals(JavaVersion.parse("11"));
}
} }