Skip to content

Add timeout functionality for hooks with 5-minute default timeout #2891

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 9 commits into from
Aug 13, 2025
Merged

Add timeout functionality for hooks with 5-minute default timeout #2891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
749a2e8
Initial plan
Copilot Aug 13, 2025
038d07d
Implement hook timeout functionality with 5-minute default timeout
Copilot Aug 13, 2025
3788f8e
Update public API snapshots to approve hook timeout changes
Copilot Aug 13, 2025
fa96072
Merge branch 'main' into copilot/fix-2890
thomhurst Aug 13, 2025
dc3e186
Implement proper hook timeout functionality with event receiver pattern
claude[bot] Aug 13, 2025
f576397
Refactor hook methods to share unified HookMethod base class
claude[bot] Aug 13, 2025
d0c57d3
Fix hook timeout implementation for PR #2891
thomhurst Aug 13, 2025
4e58d8e
fix: Update InstanceHookMethod property from ClassType to InitClassTy…
thomhurst Aug 13, 2025
c723ee3
fix: Add HookRegisteredContext and update Timeout handling in hook me…
thomhurst Aug 13, 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
Prev Previous commit
fix: Add HookRegisteredContext and update Timeout handling in hook me… 
…thods
  • Loading branch information
@thomhurst
thomhurst committed Aug 13, 2025
commit c723ee3f204bb1beab9e32874e0d4c9f2d421f87
65 changes: 33 additions & 32 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 @@ -781,6 +781,13 @@ namespace
public int Line { get; }
public int Order { get; init; }
}
public class HookRegisteredContext
{
public HookRegisteredContext(. hookMethod) { }
public . HookMethod { get; }
public string HookName { get; }
public ? Timeout { get; set; }
}
public static class HookRegistrationIndices
{
public static int GetNextAfterAssemblyHookIndex() { }
Expand Down Expand Up @@ -1506,11 +1513,12 @@ namespace
public static bool IsTransient(this .TestState state) { }
}
[(.Assembly | .Class | .Method)]
public class TimeoutAttribute : .TUnitAttribute, .IScopedAttribute, .IScopedAttribute<.TimeoutAttribute>, ., .
public class TimeoutAttribute : .TUnitAttribute, .IScopedAttribute, .IScopedAttribute<.TimeoutAttribute>, ., ., .
{
public TimeoutAttribute(int timeoutInMilliseconds) { }
public int Order { get; }
public Timeout { get; }
public . OnHookRegistered(.HookRegisteredContext context) { }
public . OnTestDiscovered(.DiscoveredTestContext context) { }
}
public class Timing : <.Timing>
Expand Down Expand Up @@ -2080,14 +2088,21 @@ namespace .Hooks
public BeforeTestSessionHookMethod() { }
public override . ExecuteAsync(.TestSessionContext context, .CancellationToken cancellationToken) { }
}
public class HookMethod
public abstract class HookMethod : <.>
{
public HookMethod(. instanceHookMethod) { }
public HookMethod(. staticHookMethod) { }
public .? InstanceHookMethod { get; }
public .? StaticHookMethod { get; }
public static . op_Implicit(. instanceHookMethod) { }
public static . op_Implicit(. staticHookMethod) { }
protected HookMethod() { }
public virtual .Assembly? Assembly { get; }
public .<> Attributes { get; }
[.(..PublicMethods)]
public abstract ClassType { get; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public interface IExecutableHook<in T>
{
Expand All @@ -2101,23 +2116,14 @@ namespace .Hooks
. Discover(string sessionId, string displayName, . hookMethod);
. Push(string sessionId, string displayName, . hookMethod, <.> func);
}
public class InstanceHookMethod : <.>, .<.TestContext>
public class InstanceHookMethod : ., <.>, .<.TestContext>
{
public InstanceHookMethod() { }
public .Assembly Assembly { get; }
public .<> Attributes { get; }
public <object, .TestContext, .CancellationToken, .>? Body { get; init; }
[.(..PublicMethods)]
public required ClassType { get; init; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public override ClassType { get; }
public required InitClassType { init; }
public . ExecuteAsync(.TestContext context, .CancellationToken cancellationToken) { }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public class LastTestInAssemblyAdapter : .<.AssemblyHookContext>
{
Expand All @@ -2140,22 +2146,13 @@ namespace .Hooks
public bool Execute(.ClassHookContext context, .CancellationToken cancellationToken) { }
public . ExecuteAsync(.ClassHookContext context, .CancellationToken cancellationToken) { }
}
public abstract class StaticHookMethod : <.>
public abstract class StaticHookMethod : ., <.>
{
protected StaticHookMethod() { }
public .Assembly? Assembly { get; }
public .<> Attributes { get; }
public ClassType { get; }
[.(..PublicMethods)]
public override ClassType { get; }
public required string FilePath { get; init; }
public required . HookExecutor { get; init; }
public required int LineNumber { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public abstract class StaticHookMethod<T> : ., <.<T>>, .<T>
{
Expand Down Expand Up @@ -2252,6 +2249,10 @@ namespace .Interfaces
. ExecuteBeforeTestHook(.MethodMetadata hookMethodInfo, .TestContext context, <.> action);
. ExecuteBeforeTestSessionHook(.MethodMetadata hookMethodInfo, .TestSessionContext context, <.> action);
}
public interface IHookRegisteredEventReceiver : .
{
. OnHookRegistered(.HookRegisteredContext context);
}
public interface IInfersType<T> { }
public interface ILastTestInAssemblyEventReceiver : .
{
Expand Down
52 changes: 21 additions & 31 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 @@ -786,6 +786,7 @@ namespace
public HookRegisteredContext(. hookMethod) { }
public . HookMethod { get; }
public string HookName { get; }
public ? Timeout { get; set; }
}
public static class HookRegistrationIndices
{
Expand Down Expand Up @@ -2087,14 +2088,21 @@ namespace .Hooks
public BeforeTestSessionHookMethod() { }
public override . ExecuteAsync(.TestSessionContext context, .CancellationToken cancellationToken) { }
}
public class HookMethod
public abstract class HookMethod : <.>
{
public HookMethod(. instanceHookMethod) { }
public HookMethod(. staticHookMethod) { }
public .? InstanceHookMethod { get; }
public .? StaticHookMethod { get; }
public static . op_Implicit(. instanceHookMethod) { }
public static . op_Implicit(. staticHookMethod) { }
protected HookMethod() { }
public virtual .Assembly? Assembly { get; }
public .<> Attributes { get; }
[.(..PublicMethods)]
public abstract ClassType { get; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public interface IExecutableHook<in T>
{
Expand All @@ -2108,23 +2116,14 @@ namespace .Hooks
. Discover(string sessionId, string displayName, . hookMethod);
. Push(string sessionId, string displayName, . hookMethod, <.> func);
}
public class InstanceHookMethod : <.>, .<.TestContext>
public class InstanceHookMethod : ., <.>, .<.TestContext>
{
public InstanceHookMethod() { }
public .Assembly Assembly { get; }
public .<> Attributes { get; }
public <object, .TestContext, .CancellationToken, .>? Body { get; init; }
[.(..PublicMethods)]
public required ClassType { get; init; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public override ClassType { get; }
public required InitClassType { init; }
public . ExecuteAsync(.TestContext context, .CancellationToken cancellationToken) { }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public class LastTestInAssemblyAdapter : .<.AssemblyHookContext>
{
Expand All @@ -2147,22 +2146,13 @@ namespace .Hooks
public bool Execute(.ClassHookContext context, .CancellationToken cancellationToken) { }
public . ExecuteAsync(.ClassHookContext context, .CancellationToken cancellationToken) { }
}
public abstract class StaticHookMethod : <.>
public abstract class StaticHookMethod : ., <.>
{
protected StaticHookMethod() { }
public .Assembly? Assembly { get; }
public .<> Attributes { get; }
public ClassType { get; }
[.(..PublicMethods)]
public override ClassType { get; }
public required string FilePath { get; init; }
public required . HookExecutor { get; init; }
public required int LineNumber { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public abstract class StaticHookMethod<T> : ., <.<T>>, .<T>
{
Expand Down
63 changes: 31 additions & 32 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 @@ -733,6 +733,13 @@ namespace
public int Line { get; }
public int Order { get; init; }
}
public class HookRegisteredContext
{
public HookRegisteredContext(. hookMethod) { }
public . HookMethod { get; }
public string HookName { get; }
public ? Timeout { get; set; }
}
public static class HookRegistrationIndices
{
public static int GetNextAfterAssemblyHookIndex() { }
Expand Down Expand Up @@ -1428,11 +1435,12 @@ namespace
public static bool IsTransient(this .TestState state) { }
}
[(.Assembly | .Class | .Method)]
public class TimeoutAttribute : .TUnitAttribute, .IScopedAttribute, .IScopedAttribute<.TimeoutAttribute>, ., .
public class TimeoutAttribute : .TUnitAttribute, .IScopedAttribute, .IScopedAttribute<.TimeoutAttribute>, ., ., .
{
public TimeoutAttribute(int timeoutInMilliseconds) { }
public int Order { get; }
public Timeout { get; }
public . OnHookRegistered(.HookRegisteredContext context) { }
public . OnTestDiscovered(.DiscoveredTestContext context) { }
}
public class Timing : <.Timing>
Expand Down Expand Up @@ -1975,14 +1983,20 @@ namespace .Hooks
public BeforeTestSessionHookMethod() { }
public override . ExecuteAsync(.TestSessionContext context, .CancellationToken cancellationToken) { }
}
public class HookMethod
public abstract class HookMethod : <.>
{
public HookMethod(. instanceHookMethod) { }
public HookMethod(. staticHookMethod) { }
public .? InstanceHookMethod { get; }
public .? StaticHookMethod { get; }
public static . op_Implicit(. instanceHookMethod) { }
public static . op_Implicit(. staticHookMethod) { }
protected HookMethod() { }
public virtual .Assembly? Assembly { get; }
public .<> Attributes { get; }
public abstract ClassType { get; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public interface IExecutableHook<in T>
{
Expand All @@ -1996,22 +2010,13 @@ namespace .Hooks
. Discover(string sessionId, string displayName, . hookMethod);
. Push(string sessionId, string displayName, . hookMethod, <.> func);
}
public class InstanceHookMethod : <.>, .<.TestContext>
public class InstanceHookMethod : ., <.>, .<.TestContext>
{
public InstanceHookMethod() { }
public .Assembly Assembly { get; }
public .<> Attributes { get; }
public <object, .TestContext, .CancellationToken, .>? Body { get; init; }
public required ClassType { get; init; }
public required . HookExecutor { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public override ClassType { get; }
public required InitClassType { init; }
public . ExecuteAsync(.TestContext context, .CancellationToken cancellationToken) { }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public class LastTestInAssemblyAdapter : .<.AssemblyHookContext>
{
Expand All @@ -2031,22 +2036,12 @@ namespace .Hooks
public bool Execute(.ClassHookContext context, .CancellationToken cancellationToken) { }
public . ExecuteAsync(.ClassHookContext context, .CancellationToken cancellationToken) { }
}
public abstract class StaticHookMethod : <.>
public abstract class StaticHookMethod : ., <.>
{
protected StaticHookMethod() { }
public .Assembly? Assembly { get; }
public .<> Attributes { get; }
public ClassType { get; }
public override ClassType { get; }
public required string FilePath { get; init; }
public required . HookExecutor { get; init; }
public required int LineNumber { get; init; }
public required .MethodMetadata MethodInfo { get; init; }
public string Name { get; }
public required int Order { get; init; }
public required int RegistrationIndex { get; init; }
public ? Timeout { get; }
public TAttribute? GetAttribute<TAttribute>()
where TAttribute : { }
}
public abstract class StaticHookMethod<T> : ., <.<T>>, .<T>
{
Expand Down Expand Up @@ -2143,6 +2138,10 @@ namespace .Interfaces
. ExecuteBeforeTestHook(.MethodMetadata hookMethodInfo, .TestContext context, <.> action);
. ExecuteBeforeTestSessionHook(.MethodMetadata hookMethodInfo, .TestSessionContext context, <.> action);
}
public interface IHookRegisteredEventReceiver : .
{
. OnHookRegistered(.HookRegisteredContext context);
}
public interface IInfersType<T> { }
public interface ILastTestInAssemblyEventReceiver : .
{
Expand Down
Loading