Skip to content

Parallelize unit tests #1584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 4 commits into from
Feb 20, 2019
Merged

Parallelize unit tests #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c482ce1
Parallelize unit tests
jkingry Mar 12, 2018
9d00191
Add length check for log indent level
asbjornu Feb 20, 2019
4c4c08d
Add try/catch around teardown code
asbjornu Feb 20, 2019
63cb9f1
Disable parallelization of ExecuteCoreTests
asbjornu Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 38 additions & 31 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,40 +66,47 @@ Setup<BuildParameters>(context =>

Teardown<BuildParameters>((context, parameters) =>
{
Information("Starting Teardown...");
try
{
Information("Starting Teardown...");

Information("Repository info : IsMainRepo {0}, IsMainBranch {1}, IsTagged: {2}, IsPullRequest: {3}",
parameters.IsMainRepo,
parameters.IsMainBranch,
parameters.IsTagged,
parameters.IsPullRequest);
Information("Repository info : IsMainRepo {0}, IsMainBranch {1}, IsTagged: {2}, IsPullRequest: {3}",
parameters.IsMainRepo,
parameters.IsMainBranch,
parameters.IsTagged,
parameters.IsPullRequest);

if(context.Successful)
if(context.Successful)
{
// if(parameters.ShouldPublish)
// {
// if(parameters.CanPostToGitter)
// {
// var message = "@/all Version " + parameters.Version.SemVersion + " of the GitVersion has just been released, https://www.nuget.org/packages/GitVersion.";

// var postMessageResult = Gitter.Chat.PostMessage(
// message: message,
// messageSettings: new GitterChatMessageSettings { Token = parameters.Gitter.Token, RoomId = parameters.Gitter.RoomId}
// );

// if (postMessageResult.Ok)
// {
// Information("Message {0} succcessfully sent", postMessageResult.TimeStamp);
// }
// else
// {
// Error("Failed to send message: {0}", postMessageResult.Error);
// }
// }
// }
}

Information("Finished running tasks.");
}
catch (Exception exception)
{
// if(parameters.ShouldPublish)
// {
// if(parameters.CanPostToGitter)
// {
// var message = "@/all Version " + parameters.Version.SemVersion + " of the GitVersion has just been released, https://www.nuget.org/packages/GitVersion.";

// var postMessageResult = Gitter.Chat.PostMessage(
// message: message,
// messageSettings: new GitterChatMessageSettings { Token = parameters.Gitter.Token, RoomId = parameters.Gitter.RoomId}
// );

// if (postMessageResult.Ok)
// {
// Information("Message {0} succcessfully sent", postMessageResult.TimeStamp);
// }
// else
// {
// Error("Failed to send message: {0}", postMessageResult.Error);
// }
// }
// }
}

Information("Finished running tasks.");
Error(exception.Dump());
}
});

//////////////////////////////////////////////////////////////////////
Expand Down
3 changes: 2 additions & 1 deletion src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
using Shouldly;

[TestFixture]
public class AssemblyInfoFileUpdaterTests : TestBase
[Parallelizable(ParallelScope.None)]
public class AssemblyInfoFileUpdaterTests
{
[SetUp]
public void Setup()
Expand Down
3 changes: 3 additions & 0 deletions src/GitVersionCore.Tests/AssemblyParallelizable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using NUnit.Framework;

[assembly: Parallelizable(ParallelScope.Fixtures)]
1 change: 1 addition & 0 deletions src/GitVersionCore.Tests/ExecuteCoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Text;

[TestFixture]
[Parallelizable(ParallelScope.None)]
public class ExecuteCoreTests : TestBase
{
IFileSystem fileSystem;
Expand Down
3 changes: 2 additions & 1 deletion src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
namespace GitVersionCore.Tests
{
[TestFixture]
public class GitVersionInformationGeneratorTests : TestBase
[Parallelizable(ParallelScope.None)]
public class GitVersionInformationGeneratorTests
{
[SetUp]
public void Setup()
Expand Down
3 changes: 2 additions & 1 deletion src/GitVersionCore/Logger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public static IDisposable IndentLog(string operationDescription)
indent = indent + " ";
return new ActionDisposable(() =>
{
indent = indent.Substring(0, indent.Length - 2);
var length = indent.Length - 2;
indent = length > 0 ? indent.Substring(0, length) : indent;
WriteInfo(string.Format(CultureInfo.InvariantCulture, "End: {0} (Took: {1:N}ms)", operationDescription, DateTime.Now.Subtract(start).TotalMilliseconds));
});
}
Expand Down
3 changes: 3 additions & 0 deletions src/GitVersionExe.Tests/AssemblyParallelizable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using NUnit.Framework;

[assembly: Parallelizable(ParallelScope.Fixtures)]
1 change: 1 addition & 0 deletions src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Shouldly;

[TestFixture]
[Parallelizable(ParallelScope.None)]
public class ExecCmdLineArgumentTest
{
[Test]
Expand Down
3 changes: 3 additions & 0 deletions src/GitVersionTask.Tests/AssemblyParallelizable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using NUnit.Framework;

[assembly: Parallelizable(ParallelScope.Fixtures)]