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

[SignalR] Fix new flaky test (#23326)

This commit is contained in:
Brennan 2020-06-24 17:53:30 -07:00 committed by GitHub
parent a90f4421ee
commit 38f9b9abdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
View File

@ -2318,10 +2318,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
Assert.Equal("text/plain", deleteContext.Response.ContentType); Assert.Equal("text/plain", deleteContext.Response.ContentType);
Assert.Equal(HttpConnectionStatus.Disposed, connection.Status); Assert.Equal(HttpConnectionStatus.Disposed, connection.Status);
await connection.ConnectionClosed.WaitForCancellationAsync().OrTimeout();
// Verify the connection not removed because application is hanging // Verify the connection not removed because application is hanging
Assert.True(manager.TryGetConnection(connection.ConnectionId, out _)); Assert.True(manager.TryGetConnection(connection.ConnectionId, out _));
Assert.True(connection.ConnectionClosed.IsCancellationRequested);
} }
} }
@ -2348,9 +2348,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
// Close the SSE connection // Close the SSE connection
connection.Transport.Output.Complete(); connection.Transport.Output.Complete();
var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously); await connection.ConnectionClosed.WaitForCancellationAsync().OrTimeout();
connection.ConnectionClosed.Register(() => tcs.SetResult(null));
await tcs.Task.OrTimeout();
} }
} }
@ -2381,9 +2379,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
await websocket.Accepted.OrTimeout(); await websocket.Accepted.OrTimeout();
await websocket.Client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", cancellationToken: default).OrTimeout(); await websocket.Client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", cancellationToken: default).OrTimeout();
var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously); await connection.ConnectionClosed.WaitForCancellationAsync().OrTimeout();
connection.ConnectionClosed.Register(() => tcs.SetResult(null));
await tcs.Task.OrTimeout();
} }
} }