Skip to content

Commit 00d34c3

Browse files
authored
Port #38814 to 6.0 (#40101)
* Port #38814 to 6.0
1 parent 006f1b8 commit 00d34c3

File tree

7 files changed

+26
-5
lines changed

7 files changed

+26
-5
lines changed

eng/test-configuration.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version" : 1,
3+
"defaultOnFailure": "fail",
4+
"localRerunCount" : 3,
5+
"retryOnRules": [
6+
{"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}},
7+
{"testName": {"contains": "CheckFrebDisconnect"}},
8+
{"testName": {"contains": "CheckStdoutWithLargeWrites"}},
9+
{"testName": {"contains": "ServerShutsDownWhenMainExitsStress" }},
10+
{"testName": {"contains": "AddressRegistrationTests" }},
11+
{"testName": {"contains": "MaxRequestBufferSizeTests.LargeUpload" }},
12+
{"failureMessage": "network disconnected" }
13+
],
14+
"failOnRules": [
15+
],
16+
"quarantineRules": [
17+
]
18+
}

src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<SignAssembly>false</SignAssembly>
66
<AssemblyName>Diagnostics.FunctionalTests</AssemblyName>
77
<TestDependsOnMssql>true</TestDependsOnMssql>
8+
9+
<!-- https://github.com/dotnet/aspnetcore/issues/38819 LocalDb sometimes hangs on win11 helix queue -->
10+
<BuildHelixPayload>false</BuildHelixPayload>
811
</PropertyGroup>
912

1013
<ItemGroup>

src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public async Task WritesToTextFile()
7373
}
7474
}
7575

76-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34284")]
7776
[Fact]
7877
public async Task RollsTextFiles()
7978
{
@@ -418,7 +417,7 @@ private async Task WaitForFile(string fileName, int length)
418417
// Continue
419418
}
420419
await Task.Delay(10);
421-
}
420+
}
422421
}
423422

424423
private async Task WaitForRoll(string fileName)

src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<BaseOutputPath />
1010
<OutputPath />
1111

12+
<!-- https://github.com/dotnet/aspnetcore/issues/38818 -->
13+
<BuildHelixPayload>false</BuildHelixPayload>
14+
1215
<!-- Properties that affect test runs -->
1316
<!-- TestTemplateCreationFolder is the folder where the templates will be created. Will point out to $(OutputDir)$(TestTemplateCreationFolder) -->
1417
<TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>

src/ProjectTemplates/test/BlazorServerTemplateTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory)
3838
[InlineData("SingleOrg", null)]
3939
[InlineData("SingleOrg", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })]
4040
[InlineData("SingleOrg", new string[] { "--calls-graph" })]
41-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")]
4241
public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish(string auth, string[] args)
4342
=> CreateBuildPublishAsync("blazorserveridweb" + Guid.NewGuid().ToString().Substring(0, 10).ToLowerInvariant(), auth, args);
4443

src/ProjectTemplates/test/RazorPagesTemplateTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB)
232232

233233
[ConditionalTheory]
234234
[InlineData("SingleOrg", new string[] { "--calls-graph" })]
235-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/31729")]
236235
public Task RazorPagesTemplate_IdentityWeb_BuildsAndPublishes_WithSingleOrg(string auth, string[] args) => BuildAndPublishRazorPagesTemplate(auth: auth, args: args);
237236

238237
private async Task<Project> BuildAndPublishRazorPagesTemplate(string auth, string[] args)

src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ from ssl in sslValues
117117
}
118118
[Theory]
119119
[MemberData(nameof(LargeUploadData))]
120-
[QuarantinedTest("This is inherently flaky and should never be unquarantined.")]
120+
// This is inherently flaky and is relying on helix retry to pass consistently
121121
public async Task LargeUpload(long? maxRequestBufferSize, bool connectionAdapter, bool expectPause)
122122
{
123123
// Parameters

0 commit comments

Comments
 (0)