Skip to content
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.

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

Improve msbuild logger for testing workloads #9706

Merged
merged 21 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
2 changes: 2 additions & 0 deletions src/Framework/Logging/AnsiCodes.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

nohwnd marked this conversation as resolved.
Show resolved Hide resolved
using System.Text.RegularExpressions;
nohwnd marked this conversation as resolved.
Show resolved Hide resolved

namespace Microsoft.Build.Logging.TerminalLogger;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
nohwnd marked this conversation as resolved.
Show resolved Hide resolved
using System.Threading.Tasks;

using Microsoft.Build.Logging.TerminalLogger;
Expand All @@ -19,11 +21,11 @@
namespace Microsoft.Build.CommandLine.UnitTests;

[UsesVerify]
public class NodeStatus_Tests
public class NodeStatus_SizeChange_Tests
{
private readonly NodeStatus _status = new("Namespace.Project", "TargetFramework", "Target", new MockStopwatch());

public NodeStatus_Tests()
public NodeStatus_SizeChange_Tests()
{
UseProjectRelativeDirectory("Snapshots");
}
Expand Down
180 changes: 180 additions & 0 deletions src/MSBuild.UnitTests/NodeStatus_Transition_Tests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;

using Microsoft.Build.Logging.TerminalLogger;
using Shouldly;
using VerifyTests;
using VerifyXunit;
using Xunit;

using static VerifyXunit.Verifier;


namespace Microsoft.Build.CommandLine.UnitTests;

[UsesVerify]
public class NodeStatus_Transition_Tests
{
public NodeStatus_Transition_Tests()
{
UseProjectRelativeDirectory("Snapshots");
}

[Fact]
public void NodeStatusTargetThrowsForInputWithAnsi()
{
#if DEBUG
Func<NodeStatus> newNodeStatus = () => new NodeStatus("project", "tfm", AnsiCodes.Colorize("colorized target", TerminalColor.Green), new MockStopwatch());
nohwnd marked this conversation as resolved.
Show resolved Hide resolved
newNodeStatus.ShouldThrow<Exception>().Message.ShouldContain("Target should not contain any escape codes, if you want to colorize target use the other constructor.");
#endif
}

[Fact]
public async Task NodeTargetChanges()
{
var rendered = Animate(
[
new("Namespace.Project", "TargetFramework", "Build", new MockStopwatch())
],
[
new("Namespace.Project", "TargetFramework", "Testing", new MockStopwatch())
]);

await VerifyReplay(rendered);
}

[Fact]
public async Task NodeTargetUpdatesTime()
{
// This test look like there is no change between the frames, but we ask the stopwatch for time they will increase the number.
// We need this because animations check that NodeStatus reference is the same.
// And we cannot use MockStopwatch because we don't know when to call Tick on them, and if we do it right away, the time will update in "both" nodes.
NodeStatus node = new("Namespace.Project", "TargetFramework", "Build", new TickingStopwatch());
var rendered = Animate(
[
node,
],
[
node,
]);

await VerifyReplay(rendered);
}

[Fact]
public async Task NodeTargetChangesToColoredTarget()
{
var rendered = Animate(
[
new("Namespace.Project", "TargetFramework", "Testing", new MockStopwatch())
],
[
new("Namespace.Project", "TargetFramework", TerminalColor.Red, "failed", "MyTestName1", new MockStopwatch())
]);

await VerifyReplay(rendered);
}

[Fact]
public async Task NodeWithColoredTargetUpdatesTime()
{
// This test look like there is no change between the frames, but we ask the stopwatch for time they will increase the number.
// We need this because animations check that NodeStatus reference is the same.
// And we cannot use MockStopwatch because we don't know when to call Tick on them, and if we do it right away, the time will update in "both" nodes.
NodeStatus node = new("Namespace.Project", "TargetFramework", TerminalColor.Green, "passed", "MyTestName1", new TickingStopwatch());
var rendered = Animate(
[
node,
],
[
node
]);

await VerifyReplay(rendered);
}

/// <summary>
/// Chains and renders node status updates and outputs replay able string of all the transitions.
/// </summary>
/// <param name="nodeStatusesUpdates">Takes array of arrays. The inner array is collection of nodes that are currently running. The outer array is how they update over time.</param>
/// <returns></returns>
private string Animate(params NodeStatus[][] nodeStatusesUpdates)
{
var width = 80;
var height = 1;

NodesFrame previousFrame = new(Array.Empty<NodeStatus>(), 0, 0);
StringBuilder result = new StringBuilder();
foreach (var nodeStatuses in nodeStatusesUpdates)
{
NodesFrame currentFrame = new NodesFrame(nodeStatuses, width, height);
result.Append(currentFrame.Render(previousFrame));
previousFrame = currentFrame;
}

return result.ToString();
}

private async Task VerifyReplay(string rendered)
{
try
{
await Verify(rendered);
}
catch (Exception ex)
{
if (ex.GetType().Name != "VerifyException")
{
throw;
}

if (!ex.Message.StartsWith("Directory:"))
{
throw;
}

string? directory = null;
string? received = null;
string? verified = null;
foreach (var line in ex.Message.Split('\n'))
{
var trimmed = line.TrimStart(' ', '-');
Extract(trimmed, "Directory", ref directory);
Extract(trimmed, "Received", ref received);
Extract(trimmed, "Verified", ref verified);
}

if (directory == null || received == null || verified == null)
{
throw;
}

var pipeline = $$""" | % { "`n`n" } { $_ -split "(?=`e)" | % { Write-Host -NoNewline $_; Start-Sleep 0.5 }; Write-Host }""";
throw new Exception($$"""
{{ex.Message.TrimEnd('\n')}}

Received replay:
Get-Content {{Path.Combine(directory, received)}} {{pipeline}}
nohwnd marked this conversation as resolved.
Show resolved Hide resolved

Verified replay:
Get-Content {{Path.Combine(directory, verified)}} {{pipeline}}
""");
}

void Extract(string line, string prefix, ref string? output)
{
if (line.StartsWith($"{prefix}: "))
{
output = line.Substring(prefix.Length + 2);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Namespace.Project TargetFramework Build (0.0s)

 Namespace.Project TargetFramework Testing (0.0s)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Namespace.Project TargetFramework Testing (0.0s)

 Namespace.Project TargetFramework failed MyTestName1 (0.0s)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Namespace.Project TargetFramework Build (0.0s)

(0.2s)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Namespace.Project TargetFramework passed MyTestName1 (0.0s)

(0.2s)
23 changes: 23 additions & 0 deletions src/MSBuild.UnitTests/StaticStopwatch.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Net.Http.Headers;
using Microsoft.Build.Logging.TerminalLogger;

namespace Microsoft.Build.CommandLine.UnitTests;

/// <summary>
/// Stopwatch that always show the time provided in constructor.
/// </summary>
internal sealed class StaticStopwatch : StopwatchAbstraction
{
public StaticStopwatch(double elapsedSeconds)
{
ElapsedSeconds = elapsedSeconds;
}

public override double ElapsedSeconds { get; }

public override void Start() => throw new System.NotImplementedException();
public override void Stop() => throw new System.NotImplementedException();
}
32 changes: 32 additions & 0 deletions src/MSBuild.UnitTests/TickingStopwatch.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Build.Logging.TerminalLogger;

namespace Microsoft.Build.CommandLine.UnitTests;

/// <summary>
/// Stopwatch that will increase by 0.1, every time you ask them for time. Useful for animations, because they check that NodeStatus
/// reference stays the same, and also for ensuring we are grabbing the time only once per frame.
/// </summary>
internal sealed class TickingStopwatch : StopwatchAbstraction
{
private double _elapsedSeconds;

public TickingStopwatch(double elapsedSeconds = 0.0)
{
_elapsedSeconds = elapsedSeconds;
}

public override double ElapsedSeconds
{
get
{
var elapsed = _elapsedSeconds;
_elapsedSeconds += 0.1;
return elapsed;
}
}
public override void Start() => throw new System.NotImplementedException();
public override void Stop() => throw new System.NotImplementedException();
}
Loading
Loading