Merge pull request #1960 from SixLabors/af/externalize-RentReturnRele…

…ase_SubsequentRentReturnsDifferentHandles Move RentReturnRelease_SubsequentRentReturnsDifferentHandles out of process
SixLabors · Jan 26, 2022 · ffa35c3 · ffa35c3
2 parents a9e718c + 30669dd
commit ffa35c3
Showing 1 changed file with 33 additions and 31 deletions.
diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs
@@ -245,43 +245,45 @@ public void Rent_MultiBuff_BelowCapacity_Succeeds(int initialRent, int attempt,
             cleanup.Register(b1);
         }
 
-        public static readonly bool IsNotMacOS = !TestEnvironment.IsOSX;
-
-        // TODO: Investigate MacOS failures
-        [ConditionalTheory(nameof(IsNotMacOS))]
+        [Theory]
         [InlineData(false)]
         [InlineData(true)]
         public void RentReturnRelease_SubsequentRentReturnsDifferentHandles(bool multiple)
         {
-            var pool = new UniformUnmanagedMemoryPool(16, 16);
-            using var cleanup = new CleanupUtil(pool);
-            UnmanagedMemoryHandle b0 = pool.Rent();
-            IntPtr h0 = b0.Handle;
-            UnmanagedMemoryHandle b1 = pool.Rent();
-            IntPtr h1 = b1.Handle;
-            pool.Return(b0);
-            pool.Return(b1);
-            pool.Release();
-
-            // Do some unmanaged allocations to make sure new pool buffers are different:
-            IntPtr[] dummy = Enumerable.Range(0, 100).Select(_ => Marshal.AllocHGlobal(16)).ToArray();
-            cleanup.Register(dummy);
+            RemoteExecutor.Invoke(RunTest, multiple.ToString()).Dispose();
 
-            if (multiple)
+            static void RunTest(string multipleInner)
             {
-                UnmanagedMemoryHandle b = pool.Rent();
-                cleanup.Register(b);
-                Assert.NotEqual(h0, b.Handle);
-                Assert.NotEqual(h1, b.Handle);
-            }
-            else
-            {
-                UnmanagedMemoryHandle[] b = pool.Rent(2);
-                cleanup.Register(b);
-                Assert.NotEqual(h0, b[0].Handle);
-                Assert.NotEqual(h1, b[0].Handle);
-                Assert.NotEqual(h0, b[1].Handle);
-                Assert.NotEqual(h1, b[1].Handle);
+                var pool = new UniformUnmanagedMemoryPool(16, 16);
+                using var cleanup = new CleanupUtil(pool);
+                UnmanagedMemoryHandle b0 = pool.Rent();
+                IntPtr h0 = b0.Handle;
+                UnmanagedMemoryHandle b1 = pool.Rent();
+                IntPtr h1 = b1.Handle;
+                pool.Return(b0);
+                pool.Return(b1);
+                pool.Release();
+
+                // Do some unmanaged allocations to make sure new pool buffers are different:
+                IntPtr[] dummy = Enumerable.Range(0, 100).Select(_ => Marshal.AllocHGlobal(16)).ToArray();
+                cleanup.Register(dummy);
+
+                if (bool.Parse(multipleInner))
+                {
+                    UnmanagedMemoryHandle b = pool.Rent();
+                    cleanup.Register(b);
+                    Assert.NotEqual(h0, b.Handle);
+                    Assert.NotEqual(h1, b.Handle);
+                }
+                else
+                {
+                    UnmanagedMemoryHandle[] b = pool.Rent(2);
+                    cleanup.Register(b);
+                    Assert.NotEqual(h0, b[0].Handle);
+                    Assert.NotEqual(h1, b[0].Handle);
+                    Assert.NotEqual(h0, b[1].Handle);
+                    Assert.NotEqual(h1, b[1].Handle);
+                }
             }
         }