From b91f10825eda108b5aed6ba8c0227acb43f7b894 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 26 Aug 2024 08:58:38 -0600 Subject: [PATCH] Disable Flaky Tests There was another flaky failure. While it seems clear what needs to be done to repair it, this commit disables these tests for now while the CI on a separate branch confirms after a few days that the tests are stable again. Issue gh-15395 --- .../OpenSaml4AssertingPartyMetadataRepositoryTests.java | 6 ++++++ .../OpenSaml5AssertingPartyMetadataRepositoryTests.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java index 2da900fd7c..b1cf9369b7 100644 --- a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java @@ -37,6 +37,7 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; @@ -105,6 +106,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception { AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository .withTrustedMetadataLocation(web.url("/entity.xml").toString()) @@ -119,6 +121,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception { List parties = new ArrayList<>(); OpenSaml4AssertingPartyMetadataRepository.withTrustedMetadataLocation(web.url("/entities.xml").toString()) @@ -215,6 +218,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -233,6 +237,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMismatchingCredentialsThenSaml2Exception() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -328,6 +333,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); diff --git a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java index c01bb82ea6..9a3132da3b 100644 --- a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java @@ -37,6 +37,7 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; @@ -105,6 +106,7 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception { AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository .withTrustedMetadataLocation(web.url("/entity.xml").toString()) @@ -119,6 +121,7 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception { List parties = new ArrayList<>(); OpenSaml5AssertingPartyMetadataRepository.withTrustedMetadataLocation(web.url("/entities.xml").toString()) @@ -215,6 +218,7 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -233,6 +237,7 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMismatchingCredentialsThenSaml2Exception() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -328,6 +333,7 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test + @Disabled("See gh-15395") public void withMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration);