Skip to content

Commit 96af635

Browse files
authored
Remove retries from BlazorWasm template tests & don't fail on restore errors (dotnet#37715)
* Remove retries from BlazorWasm template tests * Don't error on restore failure for Blazor Template tests
1 parent 1b07f2a commit 96af635

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

Diff for: src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
using Xunit;
1515
using Xunit.Abstractions;
1616

17-
namespace Templates.Test
17+
namespace BlazorTemplates.Tests
1818
{
19-
[Retry]
2019
public class BlazorServerTemplateTest : BlazorTemplateTest
2120
{
2221
public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory)

Diff for: src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplateTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Templates.Test.Helpers;
1010
using Xunit;
1111

12-
namespace Templates.Test
12+
namespace BlazorTemplates.Tests
1313
{
1414
public abstract class BlazorTemplateTest : BrowserTestBase
1515
{

Diff for: src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
using Xunit;
2222
using Xunit.Abstractions;
2323

24-
namespace Templates.Test
24+
namespace BlazorTemplates.Tests
2525
{
26-
[Retry]
2726
public class BlazorWasmTemplateTest : BlazorTemplateTest
2827
{
2928
public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory)

Diff for: src/ProjectTemplates/Shared/Project.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ internal async Task<ProcessResult> RunDotNetNewAsync(
6666
string language = null,
6767
bool useLocalDB = false,
6868
bool noHttps = false,
69+
bool errorOnRestoreError = true,
6970
string[] args = null,
7071
// Used to set special options in MSBuild
7172
IDictionary<string, string> environmentVariables = null)
@@ -127,7 +128,7 @@ internal async Task<ProcessResult> RunDotNetNewAsync(
127128
var result = new ProcessResult(execution);
128129

129130
// Because dotnet new automatically restores but silently ignores restore errors, need to handle restore errors explicitly
130-
if (execution.Output.Contains("Restore failed.") || execution.Error.Contains("Restore failed."))
131+
if (errorOnRestoreError && (execution.Output.Contains("Restore failed.") || execution.Error.Contains("Restore failed.")))
131132
{
132133
result.ExitCode = -1;
133134
}

Diff for: src/ProjectTemplates/test/BlazorTemplateTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected async Task<Project> CreateBuildPublishAsync(string projectName, string
5252
project.TargetFramework = targetFramework;
5353
}
5454

55-
var createResult = await project.RunDotNetNewAsync(ProjectType, auth: auth, args: args);
55+
var createResult = await project.RunDotNetNewAsync(ProjectType, auth: auth, args: args, errorOnRestoreError: false);
5656
Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult));
5757

5858
if (!onlyCreate)

0 commit comments

Comments
 (0)