Merge ExecuteTest back into ExecuteTestInternalAsync (#1237)

thomhurst · Nov 17, 2024 · 6f84716 · 6f84716
1 parent d36e103
commit 6f84716
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 171 deletions.
diff --git a/TUnit.Core/RunHelpers.cs b/TUnit.Core/RunHelpers.cs
@@ -7,7 +7,7 @@ namespace TUnit.Core;
 
 internal static class RunHelpers
 {
-    internal static async Task RunWithTimeoutAsync(Func<CancellationToken, Task> taskDelegate, TimeSpan? timeout, CancellationToken token)
+    internal static async Task RunWithTimeoutAsync(Func<CancellationToken, Task> taskDelegate, TimeSpan timeout, CancellationToken token)
     {
         using var cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
 
@@ -23,20 +23,10 @@ internal static async Task RunWithTimeoutAsync(Func<CancellationToken, Task> tas
                 return;
             }
 
-            if (timeout.HasValue)
-            {
-                taskCompletionSource.TrySetException(new TimeoutException(timeout.Value));
-            }
-            else
-            {
-                taskCompletionSource.TrySetCanceled(cancellationToken);
-            }
+            taskCompletionSource.TrySetException(new TimeoutException(timeout));
         });
 
-        if (timeout != null)
-        {
-            cancellationTokenSource.CancelAfter(timeout.Value);
-        }
+        cancellationTokenSource.CancelAfter(timeout);
 
         _ = taskDelegate(cancellationToken).ContinueWith(async t =>
         {

diff --git a/TUnit.Engine/Framework/TUnitServiceProvider.cs b/TUnit.Engine/Framework/TUnitServiceProvider.cs
@@ -95,15 +95,14 @@ public TUnitServiceProvider(IExtension extension,
 
         Disposer = Register(new Disposer(Logger));
 
-        var cancellationTokenSource = Register(EngineCancellationToken.CancellationTokenSource);
         var testInvoker = Register(new TestInvoker(testHookOrchestrator, Disposer));
         var explicitFilterService = Register(new ExplicitFilterService());
         var parallelLimitProvider = Register(new ParallelLimitLockProvider());
 
         // TODO
         Register(new HookMessagePublisher(extension, messageBus));
 
-        var singleTestExecutor = Register(new SingleTestExecutor(extension, cancellationTokenSource, instanceTracker, testInvoker,
+        var singleTestExecutor = Register(new SingleTestExecutor(extension, instanceTracker, testInvoker,
             explicitFilterService, parallelLimitProvider, AssemblyHookOrchestrator, classHookOrchestrator, TestFinder, TUnitMessageBus, Logger, EngineCancellationToken));
 
         TestsExecutor = Register(new TestsExecutor(singleTestExecutor, Logger, CommandLineOptions, EngineCancellationToken));