Skip to content

Don't timeout in testing task extensions when debugger is attached #903

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
JamesNK merged 1 commit into from
Jan 7, 2019
Merged

Don't timeout in testing task extensions when debugger is attached #903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions src/TestingUtils/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -12,10 +13,11 @@ public static class TaskExtensions
{
public static async Task<T> TimeoutAfter<T>(this Task<T> task, TimeSpan timeout,
[CallerFilePath] string filePath = null,
[CallerLineNumber] int lineNumber = default(int))
[CallerLineNumber] int lineNumber = default)
{
// Don't create a timer if the task is already completed
if (task.IsCompleted)
// or the debugger is attached
if (task.IsCompleted || Debugger.IsAttached)
{
return await task;
}
Expand All @@ -28,17 +30,17 @@ public static async Task<T> TimeoutAfter<T>(this Task<T> task, TimeSpan timeout,
}
else
{
throw new TimeoutException(
CreateMessage(timeout, filePath, lineNumber));
throw new TimeoutException(CreateMessage(timeout, filePath, lineNumber));
}
}

public static async Task TimeoutAfter(this Task task, TimeSpan timeout,
[CallerFilePath] string filePath = null,
[CallerLineNumber] int lineNumber = default(int))
[CallerLineNumber] int lineNumber = default)
{
// Don't create a timer if the task is already completed
if (task.IsCompleted)
// or the debugger is attached
if (task.IsCompleted || Debugger.IsAttached)
{
await task;
return;
Expand Down