Skip to content

Commit

Permalink
Remove redundant mute for bug JDK-8266279 (#83941)
Browse files Browse the repository at this point in the history
We had muted specific tests that were hit by JDK-8266279, by not
allowing the tests to run on Java 1.8.0_292. We have since upgraded
our Java 8 version in CI to Java 1.8.0_301 so the muting is
irrelevant and can be removed
  • Loading branch information
jkakavas committed Feb 16, 2022
1 parent eba3ecb commit 6786c0c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,6 @@ public void testGeneratingCsr() throws Exception {
}

public void testGeneratingSignedCertificates() throws Exception {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72639",
"1.8.0_292".equals(System.getProperty("java.version"))
);

Path tempDir = initTempDir();
Path outputFile = tempDir.resolve("out.zip");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,6 @@ public void testGeneratingSignedPemCertificates() throws Exception {
}

public void testHandleLongPasswords() throws Exception {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571",
"1.8.0_292".equals(System.getProperty("java.version"))
);

final Path tempDir = initTempDir();

Expand Down Expand Up @@ -655,10 +651,6 @@ public void testNameValues() throws Exception {
* - Checks that all 3 certificates have the right values based on the command line options provided during generation
*/
public void testCreateCaAndMultipleInstances() throws Exception {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571",
"1.8.0_292".equals(System.getProperty("java.version"))
);
final Path tempDir = initTempDir();

final MockTerminal terminal = new MockTerminal();
Expand Down Expand Up @@ -839,10 +831,6 @@ Path resolveOutputPath(Terminal terminal, OptionSet options, String defaultFilen
* - Checks that the PKCS12 certificate and the PEM certificate trust one another
*/
public void testTrustBetweenPEMandPKCS12() throws Exception {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571",
"1.8.0_292".equals(System.getProperty("java.version"))
);
final Path tempDir = initTempDir();

final MockTerminal terminal = new MockTerminal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,6 @@ public static void muteInFips() {
assumeFalse("Can't run in a FIPS JVM", inFipsJvm());
}

@BeforeClass
public static void muteOnBrokenJdk() {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359",
"1.8.0_292".equals(System.getProperty("java.version"))
);
}

public void testGenerateSingleCertificateSigningRequest() throws Exception {
final Path outFile = testRoot.resolve("csr.zip").toAbsolutePath();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.elasticsearch.xpack.security.authc.support.MockLookupRealm;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.BeforeClass;
import org.mockito.Mockito;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.metadata.resolver.impl.AbstractReloadingMetadataResolver;
Expand Down Expand Up @@ -118,14 +117,6 @@ public void setupEnv() throws PrivilegedActionException {
threadContext = new ThreadContext(globalSettings);
}

@BeforeClass
public static void muteOnBrokenJdk() {
assumeFalse(
"JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571",
"1.8.0_292".equals(System.getProperty("java.version"))
);
}

public void testReadIdpMetadataFromFile() throws Exception {
final Path path = getDataPath("idp1.xml");
Tuple<RealmConfig, SSLService> config = buildConfig(path.toString());
Expand Down

0 comments on commit 6786c0c

Please sign in to comment.