Skip to content

Commit aeb982d

Browse files
jkotalikjkotalik
authored
Skip template tests on arm queues (#28093)
1 parent ddabb1c commit aeb982d

9 files changed

+35
-15
lines changed

‎src/ProjectTemplates/test/EmptyWebTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ITestOutputHelper Output
3232
}
3333

3434
[ConditionalFact]
35-
[SkipOnHelix("Cert failures", Queues = "All.OSX")]
35+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
3636
public async Task EmptyWebTemplateCSharp()
3737
{
3838
await EmtpyTemplateCore(languageOverride: null);

‎src/ProjectTemplates/test/GrpcTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
3535
}
3636

3737
[ConditionalFact]
38-
[SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;All.OSX")]
38+
[SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
3939
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")]
4040
public async Task GrpcTemplate()
4141
{

‎src/ProjectTemplates/test/IdentityUIPackageTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public ITestOutputHelper Output
7474
};
7575

7676
[ConditionalFact]
77-
[SkipOnHelix("cert failure", Queues = "All.OSX")]
77+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
7878
public async Task IdentityUIPackage_WorksWithDifferentOptions()
7979
{
8080
var packageOptions = new Dictionary<string, string>();

‎src/ProjectTemplates/test/MvcTemplateTest.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public ITestOutputHelper Output
4040
public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");
4141

4242
[ConditionalFact]
43-
[SkipOnHelix("cert failure", Queues = "All.OSX")]
43+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
4444
public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
4545

4646
private async Task MvcTemplateCore(string languageOverride)
@@ -118,7 +118,7 @@ private async Task MvcTemplateCore(string languageOverride)
118118
[ConditionalTheory]
119119
[InlineData(true)]
120120
[InlineData(false)]
121-
[SkipOnHelix("cert failure", Queues = "All.OSX")]
121+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
122122
public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
123123
{
124124
var project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output);
@@ -305,15 +305,17 @@ public async Task MvcTemplate_SingleFileExe()
305305
await aspNetProcess.AssertPagesOk(pages);
306306
}
307307

308-
[Fact]
308+
[ConditionalFact]
309+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
309310
public async Task MvcTemplate_RazorRuntimeCompilation_BuildsAndPublishes()
310311
{
311312
var project = await MvcTemplateBuildsAndPublishes(auth: null, args: new[] { "--razor-runtime-compilation" });
312313

313314
Assert.False(Directory.Exists(Path.Combine(project.TemplatePublishDir, "refs")), "The refs directory should not be published.");
314315
}
315316

316-
[Theory]
317+
[ConditionalTheory]
318+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
317319
[InlineData("IndividualB2C", null)]
318320
[InlineData("IndividualB2C", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })]
319321
[InlineData("SingleOrg", null)]

‎src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public async Task RazorClassLibraryTemplate_WithViews_Async()
4949
Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", project, buildResult));
5050
}
5151

52-
[Fact]
52+
[ConditionalFact]
53+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
5354
public async Task RazorClassLibraryTemplateAsync()
5455
{
5556
var project = await ProjectFactory.GetOrCreateProject("razorclasslib", Output);

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
3535
}
3636

3737
[ConditionalFact]
38-
[SkipOnHelix("Cert failures", Queues = "All.OSX")]
38+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
3939
public async Task RazorPagesTemplate_NoAuth()
4040
{
4141
var project = await ProjectFactory.GetOrCreateProject("razorpagesnoauth", Output);
@@ -106,7 +106,7 @@ public async Task RazorPagesTemplate_NoAuth()
106106
[ConditionalTheory]
107107
[InlineData(false)]
108108
[InlineData(true)]
109-
[SkipOnHelix("cert failure", Queues = "All.OSX")]
109+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
110110
public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB)
111111
{
112112
var project = await ProjectFactory.GetOrCreateProject("razorpagesindividual" + (useLocalDB ? "uld" : ""), Output);
@@ -222,7 +222,8 @@ public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB)
222222
}
223223
}
224224

225-
[Fact]
225+
[ConditionalFact]
226+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
226227
public async Task RazorPagesTemplate_RazorRuntimeCompilation_BuildsAndPublishes()
227228
{
228229
var project = await BuildAndPublishRazorPagesTemplate(auth: null, new[] { "--razor-runtime-compilation" });
@@ -234,7 +235,8 @@ public async Task RazorPagesTemplate_RazorRuntimeCompilation_BuildsAndPublishes(
234235
Assert.False(Directory.Exists(refsDirectory), $"{refsDirectory} should not be in the publish output.");
235236
}
236237

237-
[Theory]
238+
[ConditionalTheory]
239+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
238240
[InlineData("IndividualB2C", null)]
239241
[InlineData("IndividualB2C", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })]
240242
[InlineData("SingleOrg", null)]

‎src/ProjectTemplates/test/WebApiTemplateTest.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public ITestOutputHelper Output
3232
}
3333
}
3434

35-
[Theory]
35+
[ConditionalTheory]
36+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
3637
[InlineData("IndividualB2C", null)]
3738
[InlineData("IndividualB2C", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })]
3839
[InlineData("SingleOrg", null)]
@@ -44,11 +45,11 @@ public ITestOutputHelper Output
4445
public Task WebApiTemplateFSharp() => WebApiTemplateCore(languageOverride: "F#");
4546

4647
[ConditionalFact]
47-
[SkipOnHelix("Cert failures", Queues = "All.OSX")]
48+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
4849
public Task WebApiTemplateCSharp() => WebApiTemplateCore(languageOverride: null);
4950

5051
[ConditionalFact]
51-
[SkipOnHelix("Cert failures", Queues = "All.OSX")]
52+
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
5253
public async Task WebApiTemplateCSharp_WithoutOpenAPI()
5354
{
5455
var project = await FactoryFixture.GetOrCreateProject("webapinoopenapi", Output);

‎src/Testing/src/PublicAPI.Unshipped.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#nullable enable
22
~Microsoft.AspNetCore.Testing.QuarantinedTestAttribute.QuarantinedTestAttribute(string reason) -> void
3+
Microsoft.AspNetCore.Testing.HelixConstants
4+
~const Microsoft.AspNetCore.Testing.HelixConstants.Windows10Arm64 = "Windows.10.Arm64v8.Open;" -> string
5+
~const Microsoft.AspNetCore.Testing.HelixConstants.DebianArm64 = "(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036;" -> string

‎src/Testing/src/xunit/HelixConstants.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
namespace Microsoft.AspNetCore.Testing
5+
{
6+
public static class HelixConstants
7+
{
8+
public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
9+
public const string DebianArm64 = "(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036;";
10+
}
11+
}

0 commit comments

Comments
 (0)