From a3a6d1d93e0c12ba4f8a816dbc73408f468ede5f Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Thu, 25 Nov 2021 19:55:12 +0100 Subject: [PATCH] Always disable MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed on Mac. --- .../Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs index ed0bed838a..84d64c757b 100644 --- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs +++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs @@ -47,11 +47,11 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators } } - public static readonly bool MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed_Enabled = - !(TestEnvironment.IsOSX && TestEnvironment.NetCoreVersion?.Major == 6); + public static readonly bool IsNotMacOs = !TestEnvironment.IsOSX; - // TODO: Investigate failure on MacOS + .net 6.0. All handles are released after GC. - [ConditionalFact(nameof(MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed_Enabled))] + // TODO: Investigate failures on MacOS. All handles are released after GC. + // (It seems to happen more consistently on .NET 6.) + [ConditionalFact(nameof(IsNotMacOs))] public void MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed() { RemoteExecutor.Invoke(RunTest).Dispose();