Merge in 'release/6.0' changes

dotnet · Feb 11, 2022 · e7bfbce · e7bfbce
2 parents 8dfa6ac + 00d34c3
commit e7bfbce
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 5 deletions.
diff --git a/eng/test-configuration.json b/eng/test-configuration.json
@@ -0,0 +1,18 @@
+{
+  "version" : 1,
+  "defaultOnFailure": "fail",
+  "localRerunCount" : 3,
+  "retryOnRules": [
+    {"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}},
+    {"testName": {"contains": "CheckFrebDisconnect"}},
+    {"testName": {"contains": "CheckStdoutWithLargeWrites"}},
+    {"testName": {"contains": "ServerShutsDownWhenMainExitsStress" }},
+    {"testName": {"contains": "AddressRegistrationTests" }},
+    {"testName": {"contains": "MaxRequestBufferSizeTests.LargeUpload" }},
+    {"failureMessage": "network disconnected" }
+  ],
+  "failOnRules": [
+  ],
+  "quarantineRules": [
+  ]
+}
diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
@@ -5,6 +5,9 @@
     <SignAssembly>false</SignAssembly>
     <AssemblyName>Diagnostics.FunctionalTests</AssemblyName>
     <TestDependsOnMssql>true</TestDependsOnMssql>
+
+    <!-- https://github.com/dotnet/aspnetcore/issues/38819 LocalDb sometimes hangs on win11 helix queue -->
+    <BuildHelixPayload>false</BuildHelixPayload>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs b/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
@@ -73,7 +73,6 @@ public async Task WritesToTextFile()
             }
         }
 
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34284")]
         [Fact]
         public async Task RollsTextFiles()
         {
@@ -418,7 +417,7 @@ private async Task WaitForFile(string fileName, int length)
                     // Continue
                 }
                 await Task.Delay(10);
-            }    
+            }
         }
 
         private async Task WaitForRoll(string fileName)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -9,6 +9,9 @@
     <BaseOutputPath />
     <OutputPath />
 
+    <!-- https://github.com/dotnet/aspnetcore/issues/38818 -->
+    <BuildHelixPayload>false</BuildHelixPayload>
+
     <!-- Properties that affect test runs -->
     <!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>

diff --git a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
@@ -38,7 +38,6 @@ public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory)
         [InlineData("SingleOrg", null)]
         [InlineData("SingleOrg", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })]
         [InlineData("SingleOrg", new string[] { "--calls-graph" })]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")]
         public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish(string auth, string[] args)
             => CreateBuildPublishAsync("blazorserveridweb" + Guid.NewGuid().ToString().Substring(0, 10).ToLowerInvariant(), auth, args);
 

diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
@@ -232,7 +232,6 @@ public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB)
 
         [ConditionalTheory]
         [InlineData("SingleOrg", new string[] { "--calls-graph" })]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/31729")]
         public Task RazorPagesTemplate_IdentityWeb_BuildsAndPublishes_WithSingleOrg(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
 
         private async Task<Project> BuildAndPublishRazorPagesTemplate(string auth, string[] args)

diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
@@ -117,7 +117,7 @@ from ssl in sslValues
         }
         [Theory]
         [MemberData(nameof(LargeUploadData))]
-        [QuarantinedTest("This is inherently flaky and should never be unquarantined.")]
+        // This is inherently flaky and is relying on helix retry to pass consistently
         public async Task LargeUpload(long? maxRequestBufferSize, bool connectionAdapter, bool expectPause)
         {
             // Parameters