Skip to content

Commit bd44d90

Browse files
authored
Merge pull request #42139 from dougbu/dougbu/reenable.tests.41937/6.0
[release/6.0] Work around #41937 and stop skipping tests
2 parents acdbf3e + ae09594 commit bd44d90

File tree

7 files changed

+7
-11
lines changed

7 files changed

+7
-11
lines changed

eng/helix/content/runtests.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ set InstallPlaywright=%$installPlaywright%
1818
set PLAYWRIGHT_BROWSERS_PATH=%CD%\ms-playwright
1919
set PLAYWRIGHT_DRIVER_PATH=%CD%\.playwright\win-x64\native\playwright.cmd
2020

21+
REM Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.
22+
set ASPNETCORE_ENVIRONMENT=
23+
2124
set "PATH=%HELIX_WORKITEM_ROOT%;%PATH%;%HELIX_WORKITEM_ROOT%\node\bin"
2225
echo Set path to: "%PATH%"
2326
echo.

eng/helix/content/runtests.sh

Lines changed: 3 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public async Task MvcControllerActionWorks()
131131
Assert.Equal("Hello human", content);
132132
}
133133

134-
[Fact(Skip = "Failing on Windows environments: https://github.com/dotnet/aspnetcore/issues/41937")]
134+
[Fact]
135135
public async Task DefaultEnvironment_Is_Development()
136136
{
137137
// Arrange

src/ProjectTemplates/test/IdentityUIPackageTest.cs

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ public ITestOutputHelper Output
4141

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

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

5250
private async Task MvcTemplateCore(string languageOverride, string[] args = null)

src/ProjectTemplates/test/RazorPagesTemplateTest.cs

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 4 deletions
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)