Skip to content

Commit

Permalink
Re-enable tests affected by #75097 (#76814)
Browse files Browse the repository at this point in the history
This change #76636 actually resolved the #75097 by only filtering out
the CAs certs/keys from xpack.security.http.ssl keystore
This change re-enables the tests previously affected by #75097

Resolves: #75097

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
BigPandaToo and elasticmachine committed Aug 23, 2021
1 parent 179a3fc commit 3a8586b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@ public void testSigningMetadataWithPasswordProtectedPemInTerminal() throws Excep
assertThat(validateSignature(descriptor.getSignature()), equalTo(true));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/75097")
public void testDefaultOptionsWithSigningAndMultipleEncryptionKeys() throws Exception {
assumeFalse("Can't run in a FIPS JVM, PKCS12 keystores are not usable", inFipsJvm());
final KeyStoreWrapper usedKeyStore = randomFrom(keyStore, passwordProtectedKeystore);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,6 @@ public void testCreateCredentialFromPemFiles() throws Exception {
assertThat(credential.getPublicKey(), equalTo(encryptionCert.getPublicKey()));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/75097")
public void testCreateEncryptionCredentialFromKeyStore() throws Exception {
assumeFalse("Can't run in a FIPS JVM, PKCS12 keystores are not usable", inFipsJvm());
final Path dir = createTempDir();
Expand Down Expand Up @@ -486,7 +485,6 @@ public void testCreateEncryptionCredentialFromKeyStore() throws Exception {
});
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/75097")
public void testCreateSigningCredentialFromKeyStoreSuccessScenarios() throws Exception {
assumeFalse("Can't run in a FIPS JVM, PKCS12 keystores are not usable", inFipsJvm());
final Path dir = createTempDir();
Expand Down Expand Up @@ -527,7 +525,6 @@ public void testCreateSigningCredentialFromKeyStoreSuccessScenarios() throws Exc
assertThat(credential.getPublicKey(), equalTo(certKeyPair1.v1().getPublicKey()));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/75097")
public void testCreateSigningCredentialFromKeyStoreFailureScenarios() throws Exception {
assumeFalse("Can't run in a FIPS JVM, PKCS12 keystores are not usable", inFipsJvm());
final Path dir = createTempDir();
Expand Down

0 comments on commit 3a8586b

Please sign in to comment.