From 13a35224650a39105eb9b05b61a19c6cd4d8d684 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Wed, 24 Nov 2021 21:47:32 +0100 Subject: [PATCH] fix tests --- .../Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs | 6 ++++-- .../Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs index 532753c802..48a03e6268 100644 --- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs +++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs @@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators UnmanagedMemoryHandle[] b = pool.Rent(64); pool.Return(a); Assert.Equal(128, UnmanagedMemoryHandle.TotalOutstandingHandles); - Thread.Sleep(20_000); + Thread.Sleep(15_000); // We expect at least 2 Trim actions, first trim 32, then 16 arrays. // 128 - 32 - 16 = 80 @@ -70,10 +70,12 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators GC.WaitForPendingFinalizers(); Assert.Equal(128, UnmanagedMemoryHandle.TotalOutstandingHandles); - Thread.Sleep(20_000); + Thread.Sleep(15_000); Assert.True( UnmanagedMemoryHandle.TotalOutstandingHandles <= 64, $"UnmanagedMemoryHandle.TotalOutstandingHandles={UnmanagedMemoryHandle.TotalOutstandingHandles} > 64"); + GC.KeepAlive(pool1); + GC.KeepAlive(pool2); } [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs index 9f96dffbd1..e6c50ae345 100644 --- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs +++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs @@ -253,6 +253,7 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators } } + [Theory] [InlineData(300)] [InlineData(600)] [InlineData(1200)] @@ -302,6 +303,7 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators } } + [Theory] [InlineData(300)] [InlineData(600)] public void MemoryOwnerFinalizer_ReturnsToPool(int length)