Skip to content

Commit ae281e9

Browse files
dougbudougbu
authored
Merge pull request #42140 from dougbu/dougbu/reenable.tests.41937/main
[main] Work around #41937 and stop skipping tests
2 parents e227ea3 + c749d7c commit ae281e9

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

‎eng/helix/content/runtests.cmd

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
1515
set DOTNET_MULTILEVEL_LOOKUP=0
1616
set PLAYWRIGHT_BROWSERS_PATH=%CD%\ms-playwright
1717

18+
REM Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.
19+
set ASPNETCORE_ENVIRONMENT=
20+
1821
set "PATH=%HELIX_WORKITEM_ROOT%;%PATH%;%HELIX_WORKITEM_ROOT%\node\bin"
1922
echo Set path to: "%PATH%"
2023
echo.

‎eng/helix/content/runtests.sh

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1313
export DOTNET_MULTILEVEL_LOOKUP=0
1414
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
1515

16+
# Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.
17+
unset ASPNETCORE_ENVIRONMENT
18+
1619
export PATH="$PATH:$DIR:$DIR/node/bin"
1720

1821
# Set playwright stuff

‎src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public async Task MvcControllerActionWorks()
127127
Assert.Equal("Hello human", content);
128128
}
129129

130-
[Fact(Skip = "Failing on Windows environments: https://github.com/dotnet/aspnetcore/issues/41937")]
130+
[Fact]
131131
public async Task DefaultEnvironment_Is_Development()
132132
{
133133
// Arrange

‎src/ProjectTemplates/test/IdentityUIPackageTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public ITestOutputHelper Output
9999

100100
[ConditionalFact]
101101
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
102-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
103102
public async Task IdentityUIPackage_WorksWithDifferentOptions()
104103
{
105104
var packageOptions = new Dictionary<string, string>();

‎src/ProjectTemplates/test/MvcTemplateTest.cs

-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ public ITestOutputHelper Output
3434

3535
[ConditionalFact]
3636
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
37-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
3837
public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
3938

4039
[ConditionalFact]
4140
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
42-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
4341
public async Task MvcTemplate_ProgramMainNoAuthCSharp() => await MvcTemplateCore(languageOverride: null, new[] { ArgConstants.UseProgramMain });
4442

4543
private async Task MvcTemplateCore(string languageOverride, string[] args = null)
@@ -119,14 +117,12 @@ private async Task MvcTemplateCore(string languageOverride, string[] args = null
119117
[InlineData(true)]
120118
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
121119
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
122-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
123120
public Task MvcTemplate_IndividualAuth_LocalDb(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
124121

125122
[ConditionalTheory]
126123
[InlineData(false)]
127124
[InlineData(true)]
128125
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
129-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
130126
public Task MvcTemplate_IndividualAuth(bool useProgramMain) => MvcTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
131127

132128
private async Task MvcTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs

-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public ITestOutputHelper Output
3636

3737
[ConditionalTheory]
3838
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
39-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
4039
[InlineData(true)]
4140
[InlineData(false)]
4241
public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
@@ -112,14 +111,12 @@ public async Task RazorPagesTemplate_NoAuth(bool useProgramMain)
112111
[InlineData(true)]
113112
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
114113
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")]
115-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
116114
public Task RazorPagesTemplate_IndividualAuth_LocalDb(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain);
117115

118116
[ConditionalTheory]
119117
[InlineData(false)]
120118
[InlineData(true)]
121119
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)]
122-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
123120
public Task RazorPagesTemplate_IndividualAuth(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain);
124121

125122
private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain)

‎src/ProjectTemplates/test/WebApiTemplateTest.cs

-4
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,18 @@ public ITestOutputHelper Output
7575

7676
[ConditionalFact]
7777
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
78-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
7978
public Task WebApiTemplateCSharp() => WebApiTemplateCore(languageOverride: null);
8079

8180
[ConditionalFact]
8281
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
83-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
8482
public Task WebApiTemplateProgramMainCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });
8583

8684
[ConditionalFact]
8785
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
88-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
8986
public Task WebApiTemplateMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseMinimalApis });
9087

9188
[ConditionalFact]
9289
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
93-
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")]
9490
public Task WebApiTemplateProgramMainMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.UseMinimalApis });
9591

9692
[ConditionalTheory]

0 commit comments

Comments
 (0)