Remove Microsoft.AspNetCore.Testing dependency from SignalR spec tests (#6629)
This commit is contained in:
parent
accbcebac0
commit
c7f05c614a
|
|
@ -0,0 +1,68 @@
|
||||||
|
// 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;
|
||||||
|
|
||||||
|
namespace Microsoft.AspNetCore.Testing
|
||||||
|
{
|
||||||
|
// Copied from https://github.com/aspnet/Extensions/blob/master/src/TestingUtils/Microsoft.AspNetCore.Testing/src/TaskExtensions.cs
|
||||||
|
// Required because Microsoft.AspNetCore.Testing is not shipped
|
||||||
|
internal static class TaskExtensions
|
||||||
|
{
|
||||||
|
public static async Task<T> TimeoutAfter<T>(this Task<T> task, TimeSpan timeout,
|
||||||
|
[CallerFilePath] string filePath = null,
|
||||||
|
[CallerLineNumber] int lineNumber = default)
|
||||||
|
{
|
||||||
|
// Don't create a timer if the task is already completed
|
||||||
|
// or the debugger is attached
|
||||||
|
if (task.IsCompleted || Debugger.IsAttached)
|
||||||
|
{
|
||||||
|
return await task;
|
||||||
|
}
|
||||||
|
|
||||||
|
var cts = new CancellationTokenSource();
|
||||||
|
if (task == await Task.WhenAny(task, Task.Delay(timeout, cts.Token)))
|
||||||
|
{
|
||||||
|
cts.Cancel();
|
||||||
|
return await task;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// Don't create a timer if the task is already completed
|
||||||
|
// or the debugger is attached
|
||||||
|
if (task.IsCompleted || Debugger.IsAttached)
|
||||||
|
{
|
||||||
|
await task;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var cts = new CancellationTokenSource();
|
||||||
|
if (task == await Task.WhenAny(task, Task.Delay(timeout, cts.Token)))
|
||||||
|
{
|
||||||
|
cts.Cancel();
|
||||||
|
await task;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new TimeoutException(CreateMessage(timeout, filePath, lineNumber));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string CreateMessage(TimeSpan timeout, string filePath, int lineNumber)
|
||||||
|
=> string.IsNullOrEmpty(filePath)
|
||||||
|
? $"The operation timed out after reaching the limit of {timeout.TotalMilliseconds}ms."
|
||||||
|
: $"The operation at {filePath}:{lineNumber} timed out after reaching the limit of {timeout.TotalMilliseconds}ms.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -16,9 +16,6 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- This reference needs to be moved. https://github.com/aspnet/AspNetCore/issues/6581 -->
|
|
||||||
<Reference Include="Microsoft.AspNetCore.Testing" />
|
|
||||||
|
|
||||||
<Reference Include="Microsoft.AspNetCore.SignalR.Common" />
|
<Reference Include="Microsoft.AspNetCore.SignalR.Common" />
|
||||||
<Reference Include="Microsoft.AspNetCore.SignalR.Core" />
|
<Reference Include="Microsoft.AspNetCore.SignalR.Core" />
|
||||||
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" />
|
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue