chore: Cleanup resources in ReusableResourceTest

Fixes #1157
testcontainers · Apr 26, 2024 · 78f147f · 78f147f
1 parent 619233a
commit 78f147f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,6 +10,7 @@
         <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0"/>
         <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
         <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4"/>
+        <PackageVersion Include="ReflectionMagic" Version="5.0.1"/>
         <PackageVersion Include="SharpZipLib" Version="1.4.2"/>
         <PackageVersion Include="SSH.NET" Version="2023.0.0"/>
         <PackageVersion Include="System.Text.Json" Version="6.0.9"/>

diff --git a/tests/Testcontainers.Platform.Linux.Tests/ReusableResourceTest.cs b/tests/Testcontainers.Platform.Linux.Tests/ReusableResourceTest.cs
@@ -51,6 +51,9 @@ await Task.WhenAll(container.StartAsync(), network.CreateAsync(), volume.CreateA
 
     public Task DisposeAsync()
     {
+        // We don't want to leak resources, but .WithReuse(true).WithCleanUp(true) is not supported.
+        // So we cheat by setting a non-empty SessionId in order DisposeAsyncCore to delete the container, network and volume.
+        Enumerable.Range(0, 3).ToList().ForEach(i => _disposables[i].AsDynamic()._configuration.SessionId = ResourceReaper.DefaultSessionId);
         return Task.WhenAll(_disposables.Select(disposable => disposable.DisposeAsync().AsTask()));
     }
 

diff --git a/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj b/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj
@@ -8,6 +8,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing"/>
         <PackageReference Include="coverlet.collector"/>
+        <PackageReference Include="ReflectionMagic" />
         <PackageReference Include="xunit.runner.visualstudio"/>
         <PackageReference Include="xunit"/>
     </ItemGroup>

diff --git a/tests/Testcontainers.Platform.Linux.Tests/Usings.cs b/tests/Testcontainers.Platform.Linux.Tests/Usings.cs
@@ -20,4 +20,5 @@
 global using JetBrains.Annotations;
 global using Microsoft.Extensions.Logging.Abstractions;
 global using Microsoft.Extensions.Logging.Testing;
+global using ReflectionMagic;
 global using Xunit;