huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add timeout back to hanging test (#1480)" (#1482) 

This reverts commit 09adc4a847.
This commit is contained in:
David Fowler 2018-02-22 00:44:06 -08:00 committed by GitHub
parent 09adc4a847
commit 7d035f48bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNetCore.SignalR.Tests.Utils/TaskExtensions.cs
View File

@ -8,7 +8,7 @@ namespace System.Threading.Tasks
{
public static class TaskExtensions
{
private const int DefaultTimeout = 1000 * 60;
private const int DefaultTimeout = 5000;
public static Task OrTimeout(this Task task, int milliseconds = DefaultTimeout, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int? lineNumber = null)
{

3
test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
View File

@ -290,7 +290,8 @@ namespace Microsoft.AspNetCore.SignalR.Tests
logger.LogInformation("Sent message", bytes.Length);
logger.LogInformation("Receiving message");
var receivedData = await receiveTcs.Task.OrTimeout();
// No timeout here because it can take a while to receive all the bytes
var receivedData = await receiveTcs.Task;
Assert.Equal(message, Encoding.UTF8.GetString(receivedData));
logger.LogInformation("Completed receive");
}