Skip to content

perf: bypass RetryHelper and TimeoutHelper when not needed #4291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomhurst merged 2 commits into from
Jan 10, 2026
Merged

perf: bypass RetryHelper and TimeoutHelper when not needed #4291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984b19c
chore: add .worktrees/ to gitignore
thomhurst Jan 10, 2026
e0d59a0
perf: bypass RetryHelper and TimeoutHelper when not needed
thomhurst Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,4 +435,7 @@ doc/plans/
*speedscope*.json

# Dotnet trace files
*.nettrace
*.nettrace

# Git worktrees
.worktrees/
158 changes: 87 additions & 71 deletions TUnit.Engine/Services/TestExecution/TestCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,78 +103,33 @@ private async ValueTask ExecuteTestInternalAsync(AbstractExecutableTest test, Ca
// Ensure TestSession hooks run before creating test instances
await _testExecutor.EnsureTestSessionHooksExecutedAsync(cancellationToken).ConfigureAwait(false);

// Execute test with retry logic - each retry gets a fresh instance
// Timeout is applied per retry attempt, not across all retries
await RetryHelper.ExecuteWithRetry(test.Context, async () =>
// Check if we can use the fast path (no retry, no timeout)
// Note: retryLimit == 0 means "no retries" (run once), not "unlimited retries"
var retryLimit = test.Context.Metadata.TestDetails.RetryLimit;
var testTimeout = test.Context.Metadata.TestDetails.Timeout;

if (retryLimit == 0 && !testTimeout.HasValue)
{
// Get timeout configuration for this attempt
var testTimeout = test.Context.Metadata.TestDetails.Timeout;
var timeoutMessage = testTimeout.HasValue
? $"Test '{test.Context.Metadata.TestDetails.TestName}' timed out after {testTimeout.Value}"
: null;

// Wrap entire lifecycle (instance creation, initialization, execution) with timeout
await TimeoutHelper.ExecuteWithTimeoutAsync(
async ct =>
{
test.Context.Metadata.TestDetails.ClassInstance = await test.CreateInstanceAsync().ConfigureAwait(false);

// Invalidate cached eligible event objects since ClassInstance changed
test.Context.CachedEligibleEventObjects = null;

// Check if this test should be skipped (after creating instance)
if (test.Context.Metadata.TestDetails.ClassInstance is SkippedTestInstance ||
!string.IsNullOrEmpty(test.Context.SkipReason))
{
await _stateManager.MarkSkippedAsync(test, test.Context.SkipReason ?? "Test was skipped").ConfigureAwait(false);

await _eventReceiverOrchestrator.InvokeTestSkippedEventReceiversAsync(test.Context, ct).ConfigureAwait(false);

await _eventReceiverOrchestrator.InvokeTestEndEventReceiversAsync(test.Context, ct).ConfigureAwait(false);

return;
}

try
{
_testInitializer.PrepareTest(test, ct);
test.Context.RestoreExecutionContext();
await _testExecutor.ExecuteAsync(test, _testInitializer, ct).ConfigureAwait(false);
}
finally
{
// Dispose test instance and fire OnDispose after each attempt
// This ensures each retry gets a fresh instance
var onDispose = test.Context.InternalEvents.OnDispose;
if (onDispose?.InvocationList != null)
{
foreach (var invocation in onDispose.InvocationList)
{
try
{
await invocation.InvokeAsync(test.Context, test.Context).ConfigureAwait(false);
}
catch (Exception disposeEx)
{
await _logger.LogErrorAsync($"Error during OnDispose for {test.TestId}: {disposeEx}").ConfigureAwait(false);
}
}
}

try
{
await TestExecutor.DisposeTestInstance(test).ConfigureAwait(false);
}
catch (Exception disposeEx)
{
await _logger.LogErrorAsync($"Error disposing test instance for {test.TestId}: {disposeEx}").ConfigureAwait(false);
}
}
},
testTimeout,
cancellationToken,
timeoutMessage).ConfigureAwait(false);
}).ConfigureAwait(false);
// Fast path: direct execution without wrapper overhead
test.Context.CurrentRetryAttempt = 0;
await ExecuteTestLifecycleAsync(test, cancellationToken).ConfigureAwait(false);
}
else
{
// Slow path: use retry and timeout wrappers
await RetryHelper.ExecuteWithRetry(test.Context, async () =>
{
var timeoutMessage = testTimeout.HasValue
? $"Test '{test.Context.Metadata.TestDetails.TestName}' timed out after {testTimeout.Value}"
: null;

await TimeoutHelper.ExecuteWithTimeoutAsync(
ct => ExecuteTestLifecycleAsync(test, ct),
testTimeout,
cancellationToken,
timeoutMessage).ConfigureAwait(false);
}).ConfigureAwait(false);
}

await _stateManager.MarkCompletedAsync(test).ConfigureAwait(false);

Expand Down Expand Up @@ -306,4 +261,65 @@ private void CollectAllDependencies(AbstractExecutableTest test, HashSet<TestDet
}
}
}

/// <summary>
/// Core test lifecycle execution: instance creation, initialization, execution, and disposal.
/// Extracted to allow bypassing retry/timeout wrappers when not needed.
/// </summary>
private async Task ExecuteTestLifecycleAsync(AbstractExecutableTest test, CancellationToken cancellationToken)
{
test.Context.Metadata.TestDetails.ClassInstance = await test.CreateInstanceAsync().ConfigureAwait(false);

// Invalidate cached eligible event objects since ClassInstance changed
test.Context.CachedEligibleEventObjects = null;

// Check if this test should be skipped (after creating instance)
if (test.Context.Metadata.TestDetails.ClassInstance is SkippedTestInstance ||
!string.IsNullOrEmpty(test.Context.SkipReason))
{
await _stateManager.MarkSkippedAsync(test, test.Context.SkipReason ?? "Test was skipped").ConfigureAwait(false);

await _eventReceiverOrchestrator.InvokeTestSkippedEventReceiversAsync(test.Context, cancellationToken).ConfigureAwait(false);

await _eventReceiverOrchestrator.InvokeTestEndEventReceiversAsync(test.Context, cancellationToken).ConfigureAwait(false);

return;
}

try
{
_testInitializer.PrepareTest(test, cancellationToken);
test.Context.RestoreExecutionContext();
await _testExecutor.ExecuteAsync(test, _testInitializer, cancellationToken).ConfigureAwait(false);
}
finally
{
// Dispose test instance and fire OnDispose after each attempt
// This ensures each retry gets a fresh instance
var onDispose = test.Context.InternalEvents.OnDispose;
if (onDispose?.InvocationList != null)
{
foreach (var invocation in onDispose.InvocationList)
{
try
{
await invocation.InvokeAsync(test.Context, test.Context).ConfigureAwait(false);
}
catch (Exception disposeEx)
{
await _logger.LogErrorAsync($"Error during OnDispose for {test.TestId}: {disposeEx}").ConfigureAwait(false);
}
}
}

try
{
await TestExecutor.DisposeTestInstance(test).ConfigureAwait(false);
}
catch (Exception disposeEx)
{
await _logger.LogErrorAsync($"Error disposing test instance for {test.TestId}: {disposeEx}").ConfigureAwait(false);
}
}
}
}
Loading