Skip to content

Port https://github.com/dotnet/aspnetcore/pull/38814 to 6.0 #40101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 11, 2022
Merged

Port https://github.com/dotnet/aspnetcore/pull/38814 to 6.0 #40101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0b52ec
Port https://github.com/dotnet/aspnetcore/pull/38814 to 6.0
pranavkm Feb 9, 2022
35946e5
Add test-configuration.json
pranavkm Feb 10, 2022
ffdce36
Add BuildHelixPayload to Blazor template test
pranavkm Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions eng/test-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
]
}
3 changes: 3 additions & 0 deletions src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dougbu had attempted to port this back to 6.0 yesterday: #38814 (comment). I'm not super sure of the background on this though.

The background is we need this addition in release/6.0 to get PRs passing because LocalDB isn't reliable where we need it to be reliable.

The un-quarantining is also fine as long as the tests have been just as reliable in this branch. If the test or test infrastructure isn't up to the task, we should backport only this change. I'm not familiar enough w/ the tests to know either way and am asking the gathered masses (as I would have if the backport bot could work)…

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/btw this lack is also holding up #40073

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar enough w/ the tests to know either way and am asking the gathered masses (as I would have if the backport bot could work)…

Checked the analytics and the tests have been passing at 100% in this branch too 🎉

</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public async Task WritesToTextFile()
}
}

[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34284")]
[Fact]
public async Task RollsTextFiles()
{
Expand Down Expand Up @@ -418,7 +417,7 @@ private async Task WaitForFile(string fileName, int length)
// Continue
}
await Task.Delay(10);
}
}
}

private async Task WaitForRoll(string fileName)
Expand Down
3 changes: 3 additions & 0 deletions src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/ProjectTemplates/test/BlazorServerTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion src/ProjectTemplates/test/RazorPagesTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down