Reenable some helix tests (#7763)

HaoK · web-flow · commit a2c8a34556ae · 2019-02-25T23:39:46.000-08:00
* Fix identity UI script tests on helix
* Add OnHelix static helper method
diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
@@ -38,8 +38,7 @@ public static IEnumerable<object[]> ScriptWithIntegrityData
             }
         }
 
-        [ConditionalTheory]
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
+        [Theory]
         [MemberData(nameof(ScriptWithIntegrityData))]
         public async Task IdentityUI_ScriptTags_SubresourceIntegrityCheck(ScriptTag scriptTag)
         {
@@ -68,8 +67,7 @@ public static IEnumerable<object[]> ScriptWithFallbackSrcData
             }
         }
 
-        [ConditionalTheory]
-        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
+        [Theory]
         [MemberData(nameof(ScriptWithFallbackSrcData))]
         public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag)
         {
@@ -148,13 +146,17 @@ private static List<ScriptTag> GetScriptTags(string cshtmlFile)
         private static string GetSolutionDir()
         {
             var dir = new DirectoryInfo(AppContext.BaseDirectory);
-            while (dir != null)
+            // On helix we use the published copy
+            if (!SkipOnHelixAttribute.OnHelix())
             {
-                if (File.Exists(Path.Combine(dir.FullName, "Identity.sln")))
+                while (dir != null)
                 {
-                    break;
+                    if (File.Exists(Path.Combine(dir.FullName, "Identity.sln")))
+                    {
+                        break;
+                    }
+                    dir = dir.Parent;
                 }
-                dir = dir.Parent;
             }
             return dir.FullName;
         }
diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -7,6 +7,8 @@
   <ItemGroup>
     <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
     <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
+    <HelixContent Include="..\..\UI\src\Areas\Identity\Pages\**\*.*" LinkBase="UI\src\Areas\Identity\Pages" />
+    <HelixContent Include="..\..\UI\src\wwwroot\**\*.*" LinkBase="UI\src\wwwroot" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -1,9 +1,11 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.AspNetCore.Mvc
 {
@@ -25,6 +27,12 @@ public static TestSource Read(string testClassName, string testMethod)
 
         private static string GetProjectDirectory()
         {
+            // On helix we use the published test files 
+            if (SkipOnHelixAttribute.OnHelix())
+            {
+                return AppContext.BaseDirectory;
+            }
+
             var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
             var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Analyzers", "test");
             return projectDirectory;
diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
@@ -4,12 +4,14 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <RootNamespace>Microsoft.AspNetCore.Mvc.Analyzers</RootNamespace>
-    <!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
+    <!-- https://github.com/aspnet/AspNetCore/issues/6549 -->	
     <BuildHelixPayload>false</BuildHelixPayload>
-  </PropertyGroup>
+   </PropertyGroup>
 
   <ItemGroup>
     <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
+    <Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -1,9 +1,11 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.AspNetCore.Mvc
 {
@@ -25,6 +27,12 @@ public static TestSource Read(string testClassName, string testMethod)
 
         private static string GetProjectDirectory()
         {
+            // On helix we use the published test files 
+            if (SkipOnHelixAttribute.OnHelix())
+            {
+                return AppContext.BaseDirectory;
+            }
+
             var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
             var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Api.Analyzers", "test");
             return projectDirectory;
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
@@ -3,12 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore.Mvc.Api.Analyzers</RootNamespace>
-    <!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
+    <!-- https://github.com/aspnet/AspNetCore/issues/6549 -->	
     <BuildHelixPayload>false</BuildHelixPayload>
-  </PropertyGroup>
+   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\..\Mvc.Analyzers\test\Infrastructure\MvcDiagnosticAnalyzerRunner.cs" Link="Infrastructure\MvcDiagnosticAnalyzerRunner.cs" />
+    <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
+    <Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
@@ -16,6 +16,7 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using Xunit;
@@ -1015,7 +1016,8 @@ await InitializeConnectionAsync(async context =>
             Assert.IsType<Http2StreamErrorException>(thrownEx.InnerException);
         }
 
-        [Fact]
+        [ConditionalFact]
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7000  
         public async Task ContentLength_Received_ReadViaPipes()
         {
             await InitializeConnectionAsync(async context =>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
@@ -262,7 +263,8 @@ await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(
             await sendTask.DefaultTimeout();
         }
 
-        [Fact]
+        [ConditionalFact]
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7000  
         public async Task DATA_Sent_TooSlowlyDueToSocketBackPressureOnSmallWrite_AbortsConnectionAfterGracePeriod()
         {
             var mockSystemClock = _serviceContext.MockSystemClock;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
@@ -30,6 +30,7 @@ public class TlsTests : LoggedTest
         private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
 
         [ConditionalFact]
+        [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7000        
         public async Task TlsHandshakeRejectsTlsLessThan12()
         {
             using (var server = new TestServer(context =>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -4,13 +4,12 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TestGroupName>InMemory.FunctionalTests</TestGroupName>
-    <!-- // https://github.com/aspnet/AspNetCore/issues/7000 -->
-    <BuildHelixPayload>false</BuildHelixPayload>
-  </PropertyGroup>
+   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)NullScope.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
+    <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
     <Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
diff --git a/src/Shared/test/SkipOnHelixAttribute.cs b/src/Shared/test/SkipOnHelixAttribute.cs
@@ -16,7 +16,7 @@ public bool IsMet
         {
             get
             {
-                return !string.Equals(Environment.GetEnvironmentVariable("helix"), "true", StringComparison.OrdinalIgnoreCase);
+                return !OnHelix();
             }
         }
 
@@ -27,5 +27,7 @@ public string SkipReason
                 return $"This test is skipped on helix";
             }
         }
+
+        public static bool OnHelix() => string.Equals(Environment.GetEnvironmentVariable("helix"), "true", StringComparison.OrdinalIgnoreCase);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public static IEnumerable<object[]> ScriptWithIntegrityData`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- [ConditionalTheory]`
`42`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
	`41`	`+ [Theory]`
`43`	`42`	`[MemberData(nameof(ScriptWithIntegrityData))]`
`44`	`43`	`public async Task IdentityUI_ScriptTags_SubresourceIntegrityCheck(ScriptTag scriptTag)`
`45`	`44`	`{`
`@@ -68,8 +67,7 @@ public static IEnumerable<object[]> ScriptWithFallbackSrcData`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`
`71`		`- [ConditionalTheory]`
`72`		`- [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549`
	`70`	`+ [Theory]`
`73`	`71`	`[MemberData(nameof(ScriptWithFallbackSrcData))]`
`74`	`72`	`public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag)`
`75`	`73`	`{`
`@@ -148,13 +146,17 @@ private static List<ScriptTag> GetScriptTags(string cshtmlFile)`
`148`	`146`	`private static string GetSolutionDir()`
`149`	`147`	`{`
`150`	`148`	`var dir = new DirectoryInfo(AppContext.BaseDirectory);`
`151`		`- while (dir != null)`
	`149`	`+ // On helix we use the published copy`
	`150`	`+ if (!SkipOnHelixAttribute.OnHelix())`
`152`	`151`	`{`
`153`		`- if (File.Exists(Path.Combine(dir.FullName, "Identity.sln")))`
	`152`	`+ while (dir != null)`
`154`	`153`	`{`
`155`		`- break;`
	`154`	`+ if (File.Exists(Path.Combine(dir.FullName, "Identity.sln")))`
	`155`	`+ {`
	`156`	`+ break;`
	`157`	`+ }`
	`158`	`+ dir = dir.Parent;`
`156`	`159`	`}`
`157`		`- dir = dir.Parent;`
`158`	`160`	`}`
`159`	`161`	`return dir.FullName;`
`160`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public class TlsTests : LoggedTest`
`30`	`30`	`private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();`
`31`	`31`
`32`	`32`	`[ConditionalFact]`
	`33`	`+ [SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7000`
`33`	`34`	`public async Task TlsHandshakeRejectsTlsLessThan12()`
`34`	`35`	`{`
`35`	`36`	`using (var server = new TestServer(context =>`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public bool IsMet`
`16`	`16`	`{`
`17`	`17`	`get`
`18`	`18`	`{`
`19`		`- return !string.Equals(Environment.GetEnvironmentVariable("helix"), "true", StringComparison.OrdinalIgnoreCase);`
	`19`	`+ return !OnHelix();`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`@@ -27,5 +27,7 @@ public string SkipReason`
`27`	`27`	`return $"This test is skipped on helix";`
`28`	`28`	`}`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public static bool OnHelix() => string.Equals(Environment.GetEnvironmentVariable("helix"), "true", StringComparison.OrdinalIgnoreCase);`
`30`	`32`	`}`
`31`	`33`	`}`