From 796189477193d8a4a8caa1ee43754b6dc189fd4e Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 20 Nov 2017 10:58:56 +0000 Subject: [PATCH] Re-enable test parallelization. Fixes #63. --- test/Templates.Test/Helpers/TemplateTestBase.cs | 9 ++++++++- test/Templates.Test/Properties/TestAttributes.cs | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 test/Templates.Test/Properties/TestAttributes.cs diff --git a/test/Templates.Test/Helpers/TemplateTestBase.cs b/test/Templates.Test/Helpers/TemplateTestBase.cs index 54854d6c75..f8466e1ea8 100644 --- a/test/Templates.Test/Helpers/TemplateTestBase.cs +++ b/test/Templates.Test/Helpers/TemplateTestBase.cs @@ -15,6 +15,8 @@ namespace Templates.Test { public class TemplateTestBase : IDisposable { + private static object DotNetNewLock = new object(); + protected string ProjectName { get; set; } protected string TemplateOutputDir { get; private set; } protected ITestOutputHelper Output { get; private set; } @@ -63,7 +65,12 @@ namespace Templates.Test args += $" -lang {language}"; } - ProcessEx.Run(Output, TemplateOutputDir, DotNetMuxer.MuxerPathOrDefault(), args).WaitForExit(assertSuccess: true); + // Only run one instance of 'dotnet new' at once, as a workaround for + // https://github.com/aspnet/templating/issues/63 + lock (DotNetNewLock) + { + ProcessEx.Run(Output, TemplateOutputDir, DotNetMuxer.MuxerPathOrDefault(), args).WaitForExit(assertSuccess: true); + } } protected void RunNpmInstall() diff --git a/test/Templates.Test/Properties/TestAttributes.cs b/test/Templates.Test/Properties/TestAttributes.cs deleted file mode 100644 index 69295a81d1..0000000000 --- a/test/Templates.Test/Properties/TestAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]