Skip to content

Fix JpegDecoderTests.Decode_IsCancellable #1415

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
merged 2 commits into from
Nov 6, 2020
Merged

Fix JpegDecoderTests.Decode_IsCancellable #1415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5748d3d
Fix #1414
antonfirsov Nov 6, 2020
73454f5
Merge branch 'master' into af/fix-Decode_IsCancellable
antonfirsov Nov 6, 2020
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
31 changes: 23 additions & 8 deletions tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,32 @@ public async Task Decode_IsCancellable(string fileName, int cancellationDelayMs)
TestEnvironment.InputImagesDirectoryFullPath,
fileName);

var cts = new CancellationTokenSource();
if (cancellationDelayMs == 0)
{
cts.Cancel();
}
else
const int NumberOfRuns = 5;

for (int i = 0; i < NumberOfRuns; i++)
{
cts.CancelAfter(cancellationDelayMs);
var cts = new CancellationTokenSource();
if (cancellationDelayMs == 0)
{
cts.Cancel();
}
else
{
cts.CancelAfter(cancellationDelayMs);
}

try
{
using var image = await Image.LoadAsync(hugeFile, cts.Token);
}
catch (TaskCanceledException)
{
// Succesfully observed a cancellation
return;
}
}

await Assert.ThrowsAsync<TaskCanceledException>(() => Image.LoadAsync(hugeFile, cts.Token));
throw new Exception($"No cancellation happened out of {NumberOfRuns} runs!");
}

[Theory(Skip = "Identify is too fast, doesn't work reliably.")]
Expand Down