feat: Allow canceling container start in xUnit.net v3 fixtures (#1431)

TheConstructor · HofmeisterAn · web-flow · commit 19867040f330 · 2025-04-27T18:00:38.000+02:00
Co-authored-by: Andre Hofmeister &lt;9199345+HofmeisterAn@users.noreply.github.com&gt;
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -18,6 +18,7 @@
         <PackageVersion Include="coverlet.collector" Version="6.0.4"/>
         <PackageVersion Include="Dapper" Version="2.1.66"/>
         <PackageVersion Include="ReflectionMagic" Version="5.0.1"/>
+        <PackageVersion Include="xunit.analyzers" Version="1.21.0"/>
         <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2"/>
         <PackageVersion Include="xunit" Version="2.9.3"/>
         <PackageVersion Include="xunit.v3" Version="2.0.1"/>
diff --git a/src/Testcontainers.Xunit/ContainerLifetime.cs b/src/Testcontainers.Xunit/ContainerLifetime.cs
@@ -71,12 +71,16 @@ protected virtual TBuilderEntity Configure(TBuilderEntity builder)
         return builder;
     }
 
-    /// <inheritdoc cref="IAsyncLifetime" />
+    /// <inheritdoc cref="IAsyncLifetime.InitializeAsync" />
     protected virtual async LifetimeTask InitializeAsync()
     {
         try
         {
+#if XUNIT_V3
+            await Container.StartAsync(TestContext.Current.CancellationToken)
+#else
             await Container.StartAsync()
+#endif
                 .ConfigureAwait(false);
         }
         catch (Exception e)
@@ -85,7 +89,11 @@ await Container.StartAsync()
         }
     }
 
-    /// <inheritdoc cref="IAsyncLifetime" />
+#if XUNIT_V3
+    /// <inheritdoc cref="IAsyncDisposable.DisposeAsync" />
+#else 
+    /// <inheritdoc cref="IAsyncLifetime.DisposeAsync" /> 
+#endif
     protected virtual async LifetimeTask DisposeAsyncCore()
     {
         if (_exception == null)
diff --git a/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj b/src/Testcontainers.Xunit/Testcontainers.Xunit.csproj
@@ -5,6 +5,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" VersionOverride="2023.3.0" PrivateAssets="All"/>
+        <PackageReference Include="xunit.analyzers" PrivateAssets="all"/>
         <PackageReference Include="xunit.extensibility.execution"/>
     </ItemGroup>
     <ItemGroup>
diff --git a/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj b/src/Testcontainers.XunitV3/Testcontainers.XunitV3.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" VersionOverride="2023.3.0" PrivateAssets="All"/>
+        <PackageReference Include="xunit.analyzers" PrivateAssets="all"/>
         <PackageReference Include="xunit.v3.extensibility.core"/>
     </ItemGroup>
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,16 @@ protected virtual TBuilderEntity Configure(TBuilderEntity builder)`
`71`	`71`	`return builder;`
`72`	`72`	`}`
`73`	`73`
`74`		`- /// <inheritdoc cref="IAsyncLifetime" />`
	`74`	`+ /// <inheritdoc cref="IAsyncLifetime.InitializeAsync" />`
`75`	`75`	`protected virtual async LifetimeTask InitializeAsync()`
`76`	`76`	`{`
`77`	`77`	`try`
`78`	`78`	`{`
	`79`	`+#if XUNIT_V3`
	`80`	`+ await Container.StartAsync(TestContext.Current.CancellationToken)`
	`81`	`+#else`
`79`	`82`	`await Container.StartAsync()`
	`83`	`+#endif`
`80`	`84`	`.ConfigureAwait(false);`
`81`	`85`	`}`
`82`	`86`	`catch (Exception e)`
`@@ -85,7 +89,11 @@ await Container.StartAsync()`
`85`	`89`	`}`
`86`	`90`	`}`
`87`	`91`
`88`		`- /// <inheritdoc cref="IAsyncLifetime" />`
	`92`	`+#if XUNIT_V3`
	`93`	`+ /// <inheritdoc cref="IAsyncDisposable.DisposeAsync" />`
	`94`	`+#else`
	`95`	`+ /// <inheritdoc cref="IAsyncLifetime.DisposeAsync" />`
	`96`	`+#endif`
`89`	`97`	`protected virtual async LifetimeTask DisposeAsyncCore()`
`90`	`98`	`{`
`91`	`99`	`if (_exception == null)`