From 482d2fd21a03e82bb8eb920e2c0da02b7b899770 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 31 Mar 2020 11:43:15 -0700 Subject: [PATCH 1/9] Reenable cert tests on helix --- .../test/Configuration/ConfigureSigningCredentialsTests.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs index 099fdf73e50c..818150477285 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs @@ -23,7 +23,6 @@ public class ConfigureSigningCredentialsTests X509KeyStorageFlags.DefaultKeySet); [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] [FrameworkSkipCondition(RuntimeFrameworks.CLR)] public void Configure_AddsDevelopmentKeyFromConfiguration() { @@ -63,8 +62,7 @@ public void Configure_AddsDevelopmentKeyFromConfiguration() } } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] + [Fact] public void Configure_LoadsPfxCertificateCredentialFromConfiguration() { // Arrange @@ -93,8 +91,7 @@ public void Configure_LoadsPfxCertificateCredentialFromConfiguration() Assert.Equal("AC8FDF4BD4C10841BD24DC88D983225D10B43BB2", key.Certificate.Thumbprint); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] + [Fact] public void Configure_LoadsCertificateStoreCertificateCredentialFromConfiguration() { try From 9999b926611fe1ef701828297debf9e85a6d9ed6 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 31 Mar 2020 11:44:28 -0700 Subject: [PATCH 2/9] Update ci.yml --- .azure/pipelines/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index e356ab3d42e1..9067a327a8ef 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -689,7 +689,7 @@ stages: - template: jobs/default-build.yml parameters: - condition: notin(variables['Build.Reason'], 'PullRequest') + #condition: notin(variables['Build.Reason'], 'PullRequest') jobName: Helix_x64_daily jobDisplayName: 'Tests: Helix x64 Daily' agentOs: Windows @@ -715,7 +715,7 @@ stages: # Helix ARM64 - template: jobs/default-build.yml parameters: - condition: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) + #condition: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) jobName: Helix_arm64_daily jobDisplayName: "Tests: Helix ARM64 Daily" agentOs: Linux From c3cef2971e8979fae72c1123a9c0ff3646a44b53 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 31 Mar 2020 11:46:24 -0700 Subject: [PATCH 3/9] Update CertificateManagerTests.cs --- .../test/CertificateManagerTests.cs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs index 5651ba46220d..e323a0db878b 100644 --- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs +++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs @@ -28,8 +28,7 @@ public CertificateManagerTests(ITestOutputHelper output, CertFixture fixture) public ITestOutputHelper Output { get; } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_CreatesACertificate_WhenThereAreNoHttpsCertificates() { try @@ -123,8 +122,7 @@ private void ListCertificates(ITestOutputHelper output) } } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_DoesNotCreateACertificate_WhenThereIsAnExistingHttpsCertificates() { // Arrange @@ -154,8 +152,7 @@ public void EnsureCreateHttpsCertificate_DoesNotCreateACertificate_WhenThereIsAn Assert.Equal(httpsCertificate.GetCertHashString(), exportedCertificate.GetCertHashString()); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateIfVersionIsIncorrect() { _fixture.CleanupCertificates(); @@ -170,8 +167,7 @@ public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateIfVersionIsInc Assert.Empty(httpsCertificateList); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateForEmptyVersionField() { _fixture.CleanupCertificates(); @@ -187,8 +183,7 @@ public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateForEmptyVersio Assert.Empty(httpsCertificateList); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero() { _fixture.CleanupCertificates(); @@ -202,8 +197,7 @@ public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero() Assert.NotEmpty(httpsCertificateList); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6721")] + [Fact] public void EnsureCreateHttpsCertificate_ReturnValidIfCertIsNewer() { _fixture.CleanupCertificates(); From 255eb19d0b772d5ce50e665df89a2fafa9fe5e6e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 31 Mar 2020 11:47:54 -0700 Subject: [PATCH 4/9] Update SigningKeysLoaderTests.cs --- .../test/Configuration/SigningKeysLoaderTests.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs index c5d543dfe90c..14bcb09e7b31 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs @@ -58,8 +58,7 @@ public static void LoadFromStoreCert_ThrowsIfThereIsNoCertificateAvailable() Assert.Equal("Couldn't find a valid certificate with subject 'Invalid' on the 'CurrentUser\\My'", exception.Message); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] + [Fact] public static void LoadFromStoreCert_SkipsCertificatesNotYetValid() { try @@ -81,8 +80,7 @@ public static void LoadFromStoreCert_SkipsCertificatesNotYetValid() } } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] + [Fact] public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate() { try @@ -104,8 +102,7 @@ public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate() } } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720")] + [Fact] public static void LoadFromStoreCert_SkipsExpiredCertificates() { try From d975c43eb4b6a1ef7220ef13dca37140b994e313 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 31 Mar 2020 11:53:19 -0700 Subject: [PATCH 5/9] Update RendererTest.cs --- src/Components/Components/test/RendererTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs index 77e0b06faa71..5ecddb3ed697 100644 --- a/src/Components/Components/test/RendererTest.cs +++ b/src/Components/Components/test/RendererTest.cs @@ -2810,8 +2810,7 @@ public void CanTriggerRenderingSynchronouslyFromInsideAfterRenderCallback() Assert.Equal(10, component.OnAfterRenderCallCount); } - [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/7487")] + [Fact] public async Task CanTriggerEventHandlerDisposedInEarlierPendingBatchAsync() { // This represents the scenario where the same event handler is being triggered From e6a812abc1d0a9ce537d9d9ed0d5b74e2e3f08a4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 1 Apr 2020 10:20:46 -0700 Subject: [PATCH 6/9] Update SigningKeysLoaderTests.cs --- .../test/Configuration/SigningKeysLoaderTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs index 14bcb09e7b31..893be873abe1 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs @@ -58,7 +58,8 @@ public static void LoadFromStoreCert_ThrowsIfThereIsNoCertificateAvailable() Assert.Equal("Couldn't find a valid certificate with subject 'Invalid' on the 'CurrentUser\\My'", exception.Message); } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public static void LoadFromStoreCert_SkipsCertificatesNotYetValid() { try @@ -80,7 +81,8 @@ public static void LoadFromStoreCert_SkipsCertificatesNotYetValid() } } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate() { try @@ -102,7 +104,8 @@ public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate() } } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public static void LoadFromStoreCert_SkipsExpiredCertificates() { try From f0c2ab6116b9c0bd7ef97a79a6153aa5ee0debc0 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 1 Apr 2020 10:22:52 -0700 Subject: [PATCH 7/9] Update CertificateManagerTests.cs --- .../test/CertificateManagerTests.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs index e323a0db878b..6114e56a44e2 100644 --- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs +++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs @@ -28,7 +28,8 @@ public CertificateManagerTests(ITestOutputHelper output, CertFixture fixture) public ITestOutputHelper Output { get; } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void EnsureCreateHttpsCertificate_CreatesACertificate_WhenThereAreNoHttpsCertificates() { try @@ -122,7 +123,8 @@ private void ListCertificates(ITestOutputHelper output) } } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void EnsureCreateHttpsCertificate_DoesNotCreateACertificate_WhenThereIsAnExistingHttpsCertificates() { // Arrange @@ -183,7 +185,8 @@ public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateForEmptyVersio Assert.Empty(httpsCertificateList); } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero() { _fixture.CleanupCertificates(); @@ -197,7 +200,8 @@ public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero() Assert.NotEmpty(httpsCertificateList); } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void EnsureCreateHttpsCertificate_ReturnValidIfCertIsNewer() { _fixture.CleanupCertificates(); From f81293f24aca6100ff741e3775adbec37618c9ed Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 1 Apr 2020 12:16:49 -0700 Subject: [PATCH 8/9] Update ConfigureSigningCredentialsTests.cs --- .../test/Configuration/ConfigureSigningCredentialsTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs index 818150477285..dda0233d77f7 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs +++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs @@ -62,7 +62,8 @@ public void Configure_AddsDevelopmentKeyFromConfiguration() } } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void Configure_LoadsPfxCertificateCredentialFromConfiguration() { // Arrange @@ -91,7 +92,8 @@ public void Configure_LoadsPfxCertificateCredentialFromConfiguration() Assert.Equal("AC8FDF4BD4C10841BD24DC88D983225D10B43BB2", key.Certificate.Thumbprint); } - [Fact] + [ConditionalFact] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public void Configure_LoadsCertificateStoreCertificateCredentialFromConfiguration() { try From 1e52deeb3cc2060d4bb1285c1a36fc7be1eab2bd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 3 Apr 2020 12:03:11 -0700 Subject: [PATCH 9/9] Update ci.yml --- .azure/pipelines/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9067a327a8ef..e356ab3d42e1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -689,7 +689,7 @@ stages: - template: jobs/default-build.yml parameters: - #condition: notin(variables['Build.Reason'], 'PullRequest') + condition: notin(variables['Build.Reason'], 'PullRequest') jobName: Helix_x64_daily jobDisplayName: 'Tests: Helix x64 Daily' agentOs: Windows @@ -715,7 +715,7 @@ stages: # Helix ARM64 - template: jobs/default-build.yml parameters: - #condition: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) + condition: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) jobName: Helix_arm64_daily jobDisplayName: "Tests: Helix ARM64 Daily" agentOs: Linux