From 00d34c3bd7e6eaedb3e90bb553486900f8ef94d4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 10 Feb 2022 17:09:11 -0800
Subject: [PATCH] Port https://github.com/dotnet/aspnetcore/pull/38814 to 6.0
(#40101)
* Port https://github.com/dotnet/aspnetcore/pull/38814 to 6.0
---
eng/test-configuration.json | 18 ++++++++++++++++++
.../Diagnostics.FunctionalTests.csproj | 3 +++
.../test/FileLoggerProcessorTests.cs | 3 +--
.../BlazorTemplates.Tests.csproj | 3 +++
.../test/BlazorServerTemplateTest.cs | 1 -
.../test/RazorPagesTemplateTest.cs | 1 -
.../MaxRequestBufferSizeTests.cs | 2 +-
7 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 eng/test-configuration.json
diff --git a/eng/test-configuration.json b/eng/test-configuration.json
new file mode 100644
index 00000000000..6f8c5e36aaf
--- /dev/null
+++ 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": [
+ ]
+}
\ No newline at end of file
diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
index b7caf9c87e3..6104a9162ac 100644
--- 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
index a3c6bfd9676..b051337a5c7 100644
--- a/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
+++ b/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
@@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.HttpLogging
}
}
- [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34284")]
[Fact]
public async Task RollsTextFiles()
{
@@ -418,7 +417,7 @@ namespace Microsoft.AspNetCore.HttpLogging
// 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
index 60ef4717220..a488e407386 100644
--- 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
index f16a58e77aa..432c85043bd 100644
--- a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
+++ b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
@@ -38,7 +38,6 @@ namespace Templates.Test
[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
index ac1b0742620..1af0a68366f 100644
--- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
+++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
@@ -232,7 +232,6 @@ namespace Templates.Test
[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
index 836d0bb1082..4be9eac3c3e 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
@@ -117,7 +117,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
[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
--
GitLab