Mirrors/CliFx
1
0
Fork 0
mirror of https://github.com/Tyrrrz/CliFx.git synced 2025-10-25 15:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cancellation tests

Browse Source
This commit is contained in:
Tyrrrz
2023-05-16 02:43:47 +03:00
parent aa8315b68d
commit 81f8b17451
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CliFx.Tests.Dummy/Commands/CancellationTestCommand.cs
View File

@@ -12,16 +12,18 @@ public class CancellationTestCommand : ICommand
{ {
try try
{ {
console.Output.WriteLine("Started.");
await Task.Delay( await Task.Delay(
TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(3),
console.RegisterCancellationHandler() console.RegisterCancellationHandler()
); );
console.Output.WriteLine("Completed successfully"); console.Output.WriteLine("Completed.");
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
console.Output.WriteLine("Cancelled"); console.Output.WriteLine("Cancelled.");
throw; throw;
} }
} }

38
CliFx.Tests/CancellationSpecs.cs
View File

@@ -4,6 +4,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CliFx.Tests.Utils; using CliFx.Tests.Utils;
using CliFx.Tests.Utils.Extensions;
using CliWrap; using CliWrap;
using FluentAssertions; using FluentAssertions;
using Xunit; using Xunit;
@@ -22,16 +23,29 @@ public class CancellationSpecs : SpecsBase
public async Task I_can_configure_the_command_to_listen_to_the_interrupt_signal() public async Task I_can_configure_the_command_to_listen_to_the_interrupt_signal()
{ {
// Arrange // Arrange
using var cts = new CancellationTokenSource();
// We need to send the cancellation request right after the process has registered
// a handler for the interrupt signal, otherwise the default handler will trigger
// and just kill the process.
void HandleStdOut(string line)
{
if (string.Equals(line, "Started.", StringComparison.OrdinalIgnoreCase))
cts.CancelAfter(TimeSpan.FromSeconds(0.2));
}
var stdOutBuffer = new StringBuilder(); var stdOutBuffer = new StringBuilder();
var pipeTarget = PipeTarget.Merge(
PipeTarget.ToDelegate(HandleStdOut),
PipeTarget.ToStringBuilder(stdOutBuffer)
);
var command = Cli.Wrap("dotnet") var command = Cli.Wrap("dotnet")
.WithArguments(a => a .WithArguments(a => a
.Add(Dummy.Program.Location) .Add(Dummy.Program.Location)
.Add("cancel-test") .Add("cancel-test")
) | stdOutBuffer; ) | pipeTarget;
using var cts = new CancellationTokenSource();
cts.CancelAfter(TimeSpan.FromSeconds(0.2));
// Act & assert // Act & assert
await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
@@ -43,7 +57,10 @@ public class CancellationSpecs : SpecsBase
) )
); );
stdOutBuffer.ToString().Trim().Should().Be("Cancelled"); stdOutBuffer.ToString().Trim().Should().ConsistOfLines(
"Started.",
"Cancelled."
);
} }
[Fact] [Fact]
@@ -60,16 +77,18 @@ public class CancellationSpecs : SpecsBase
{ {
try try
{ {
console.Output.WriteLine("Started.");
await Task.Delay( await Task.Delay(
TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(3),
console.RegisterCancellationHandler() console.RegisterCancellationHandler()
); );
console.Output.WriteLine("Completed successfully"); console.Output.WriteLine("Completed.");
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
console.Output.WriteLine("Cancelled"); console.Output.WriteLine("Cancelled.");
throw; throw;
} }
} }
@@ -94,6 +113,9 @@ public class CancellationSpecs : SpecsBase
exitCode.Should().NotBe(0); exitCode.Should().NotBe(0);
var stdOut = FakeConsole.ReadOutputString(); var stdOut = FakeConsole.ReadOutputString();
stdOut.Trim().Should().Be("Cancelled"); stdOut.Trim().Should().ConsistOfLines(
"Started.",
"Cancelled."
);
} }
} }