From a65e34bd30b2d4b73882ace493d4307087e8051b Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 16 Jan 2019 15:42:27 -0800 Subject: [PATCH 1/5] Revert "Revert "Put Razor.Design.Test and Razor.Language.Test in a different test group (#6725)" (#6753)" This reverts commit 9831238b7c72ddd083b8df5d8a53ff396cef0e22. --- .../Microsoft.AspNetCore.Razor.Design.Test.csproj | 1 + .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj index b27dca6270..86bcbf5a9f 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj +++ b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj @@ -13,6 +13,7 @@ true $(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs + RazorTests diff --git a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj index d1946a6d9c..9c5339ed8c 100644 --- a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -4,6 +4,7 @@ netcoreapp2.1;net46 $(DefaultItemExcludes);TestFiles\**\* $(DefineConstants);GENERATE_BASELINES + RazorTests From 9dee5d7e26eb79eabd224918b531a0d952f66456 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 18 Jan 2019 19:29:46 -0800 Subject: [PATCH 2/5] Move identity functional test to their own group (#6865) --- .../Microsoft.AspNetCore.Identity.FunctionalTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 53f6325cc6..be62632bfb 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -2,6 +2,7 @@ netcoreapp2.1;net461 + Identity.FunctionalTest From 31d57a575682fcab4bd1e7fa6f9711f4a0c12fbd Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Tue, 22 Jan 2019 08:58:33 -0800 Subject: [PATCH 3/5] Move Kestrel Sockets tests to their own group (#6869) --- .../test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj index 8600f1086c..53d95756c9 100644 --- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj @@ -5,6 +5,7 @@ $(DefineConstants);MACOS $(DefineConstants);SOCKETS true + Sockets.FunctionalTest From 51ec523d9ef9e7dc1380a452611d6fc7c6c1d895 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 31 Jan 2019 14:09:34 -0800 Subject: [PATCH 4/5] Attempt to install chromium as part of restore instead of running the CORS tests One more go at https://github.com/aspnet/AspNetCore-Internal/issues/1619 --- .../CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj | 5 +++++ .../test/FunctionalTests/CorsMiddlewareFunctionalTest.cs | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj index 87da25f520..4581b617fc 100644 --- a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj +++ b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj @@ -12,5 +12,10 @@ false + + + + + diff --git a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs index b5b5ece9eb..6a874e0b80 100644 --- a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs +++ b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs @@ -48,6 +48,8 @@ namespace FunctionalTests Arguments = "test --no-watchman", }; } + // Disallow the test from downloading \ installing chromium. + processStartInfo.Environment["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"; // Act var result = await ProcessManager.RunProcessAsync(processStartInfo, loggerFactory.CreateLogger("ProcessManager")); From c1a756c575e61baffaef4763730e2152c78e50d1 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 1 Feb 2019 09:54:24 -0800 Subject: [PATCH 5/5] Skip test on OSX until this can be further diagnosed --- .../CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs index 6a874e0b80..e8178f6c5d 100644 --- a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs +++ b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs @@ -8,6 +8,7 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -25,7 +26,8 @@ namespace FunctionalTests public ITestOutputHelper Output { get; } - [Fact] + [ConditionalFact] + [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Disabling this test on OSX until we have a resolution for https://github.com/aspnet/AspNetCore-Internal/issues/1619")] public async Task RunClientTests() { using (StartLog(out var loggerFactory))