Merge branch 'master' into js/Shuffle3Channel

tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@@ -141,6 +141,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 TestEnvironment.InputImagesDirectoryFullPath,
                 fileName);
 
+            const int NumberOfRuns = 5;
+
+            for (int i = 0; i < NumberOfRuns; i++)
+            {
                 var cts = new CancellationTokenSource();
                 if (cancellationDelayMs == 0)
                 {
@@ -151,7 +155,18 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     cts.CancelAfter(cancellationDelayMs);
                 }
 
-            await Assert.ThrowsAsync<TaskCanceledException>(() => Image.LoadAsync(hugeFile, cts.Token));
+                try
+                {
+                    using var image = await Image.LoadAsync(hugeFile, cts.Token);
+                }
+                catch (TaskCanceledException)
+                {
+                    // Succesfully observed a cancellation
+                    return;
+                }
+            }
+
+            throw new Exception($"No cancellation happened out of {NumberOfRuns} runs!");
         }
 
         [Theory(Skip = "Identify is too fast, doesn't work reliably.")]