Skip to content

Expose CurrentRetryAttempt on TestContext #3274

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
merged 2 commits into from
Oct 3, 2025
Merged

Expose CurrentRetryAttempt on TestContext #3274

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
1d877d0
Expose CurrentRetryAttempt on TestContext
thomhurst Oct 3, 2025
ad8228e
feat: add CurrentRetryAttempt property to TestContext for enhanced re…
thomhurst Oct 3, 2025
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
2 changes: 2 additions & 0 deletions TUnit.Core/TestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ public async Task ReregisterTestWithArguments(object?[]? methodArguments = null,

public DateTimeOffset? TestEnd { get; set; }

public int CurrentRetryAttempt { get; internal set; }


public IEnumerable<TestContext> GetTests(Func<TestContext, bool> predicate)
{
Expand Down
6 changes: 4 additions & 2 deletions TUnit.Engine/Services/TestExecution/RetryHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public static async Task ExecuteWithRetry(TestContext testContext, Func<Task> ac

for (var attempt = 0; attempt < maxRetries + 1; attempt++)
{
testContext.CurrentRetryAttempt = attempt;

try
{
await action();
Expand Down Expand Up @@ -42,13 +44,13 @@ private static async Task<bool> ShouldRetry(TestContext testContext, Exception e
{
return false;
}

if (testContext.RetryFunc == null)
{
// Default behavior: retry on any exception if within retry limit
return true;
}

return await testContext.RetryFunc(testContext, ex, attempt + 1).ConfigureAwait(false);
}
}
1 change: 1 addition & 0 deletions TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,7 @@ namespace
public .<.Artifact> Artifacts { get; }
public .CancellationToken CancellationToken { get; set; }
public .ClassHookContext ClassContext { get; }
public int CurrentRetryAttempt { get; }
public .<.TestDetails> Dependencies { get; }
public ? DisplayNameFormatter { get; set; }
public .TestContextEvents Events { get; }
Expand Down
1 change: 1 addition & 0 deletions TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,7 @@ namespace
public .<.Artifact> Artifacts { get; }
public .CancellationToken CancellationToken { get; set; }
public .ClassHookContext ClassContext { get; }
public int CurrentRetryAttempt { get; }
public .<.TestDetails> Dependencies { get; }
public ? DisplayNameFormatter { get; set; }
public .TestContextEvents Events { get; }
Expand Down
1 change: 1 addition & 0 deletions TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ namespace
public .<.Artifact> Artifacts { get; }
public .CancellationToken CancellationToken { get; set; }
public .ClassHookContext ClassContext { get; }
public int CurrentRetryAttempt { get; }
public .<.TestDetails> Dependencies { get; }
public ? DisplayNameFormatter { get; set; }
public .TestContextEvents Events { get; }
Expand Down
Loading