From 38429dedeaee9dae30c658ede696ccdcad2a6a52 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 20 Oct 2021 09:56:15 -0700 Subject: [PATCH 1/2] Remove retries from BlazorWasm template tests --- .../BlazorTemplates.Tests/BlazorServerTemplateTest.cs | 3 +-- .../BlazorTemplates.Tests/BlazorTemplateTest.cs | 2 +- .../BlazorTemplates.Tests/BlazorWasmTemplateTest.cs | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs index bf5d3fc8d32a..813e54a38913 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs @@ -14,9 +14,8 @@ using Xunit; using Xunit.Abstractions; -namespace Templates.Test +namespace BlazorTemplates.Tests { - [Retry] public class BlazorServerTemplateTest : BlazorTemplateTest { public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory) diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplateTest.cs index 7ff582dcd896..27f2789ed9f2 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplateTest.cs +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplateTest.cs @@ -9,7 +9,7 @@ using Templates.Test.Helpers; using Xunit; -namespace Templates.Test +namespace BlazorTemplates.Tests { public abstract class BlazorTemplateTest : BrowserTestBase { diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs index f6e351461e4d..ae97ef7c94fe 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs @@ -21,9 +21,8 @@ using Xunit; using Xunit.Abstractions; -namespace Templates.Test +namespace BlazorTemplates.Tests { - [Retry] public class BlazorWasmTemplateTest : BlazorTemplateTest { public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory) From 012617d975c8b9a40bb44609de00751458a677db Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 20 Oct 2021 13:57:55 -0700 Subject: [PATCH 2/2] Don't error on restore failure for Blazor Template tests --- src/ProjectTemplates/Shared/Project.cs | 3 ++- src/ProjectTemplates/test/BlazorTemplateTest.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/Shared/Project.cs b/src/ProjectTemplates/Shared/Project.cs index 695cefee4bd8..fac62bf1d60a 100644 --- a/src/ProjectTemplates/Shared/Project.cs +++ b/src/ProjectTemplates/Shared/Project.cs @@ -66,6 +66,7 @@ internal async Task RunDotNetNewAsync( string language = null, bool useLocalDB = false, bool noHttps = false, + bool errorOnRestoreError = true, string[] args = null, // Used to set special options in MSBuild IDictionary environmentVariables = null) @@ -127,7 +128,7 @@ internal async Task RunDotNetNewAsync( var result = new ProcessResult(execution); // Because dotnet new automatically restores but silently ignores restore errors, need to handle restore errors explicitly - if (execution.Output.Contains("Restore failed.") || execution.Error.Contains("Restore failed.")) + if (errorOnRestoreError && (execution.Output.Contains("Restore failed.") || execution.Error.Contains("Restore failed."))) { result.ExitCode = -1; } diff --git a/src/ProjectTemplates/test/BlazorTemplateTest.cs b/src/ProjectTemplates/test/BlazorTemplateTest.cs index 792e9fd24750..a9da3f2cf8a2 100644 --- a/src/ProjectTemplates/test/BlazorTemplateTest.cs +++ b/src/ProjectTemplates/test/BlazorTemplateTest.cs @@ -52,7 +52,7 @@ protected async Task CreateBuildPublishAsync(string projectName, string project.TargetFramework = targetFramework; } - var createResult = await project.RunDotNetNewAsync(ProjectType, auth: auth, args: args); + var createResult = await project.RunDotNetNewAsync(ProjectType, auth: auth, args: args, errorOnRestoreError: false); Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult)); if (!onlyCreate)