From 47220cf13ec36f9f4bd33402d6db9b228e2f1891 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Thu, 28 Feb 2019 09:23:33 -0800 Subject: [PATCH] Fix StreamInvocationsBlockOtherInvocationsUntilTheyStartStreaming (#8015) --- src/SignalR/server/SignalR/test/EndToEndTests.cs | 2 +- .../server/SignalR/test/HubConnectionHandlerTests.cs | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/SignalR/server/SignalR/test/EndToEndTests.cs b/src/SignalR/server/SignalR/test/EndToEndTests.cs index d8f7cb754b..97a9432d37 100644 --- a/src/SignalR/server/SignalR/test/EndToEndTests.cs +++ b/src/SignalR/server/SignalR/test/EndToEndTests.cs @@ -335,7 +335,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests logger.LogInformation("Receiving message"); // Big timeout here because it can take a while to receive all the bytes - var receivedData = await connection.Transport.Input.ReadAsync(bytes.Length); + var receivedData = await connection.Transport.Input.ReadAsync(bytes.Length).OrTimeout(TimeSpan.FromMinutes(2)); Assert.Equal(message, Encoding.UTF8.GetString(receivedData)); logger.LogInformation("Completed receive"); } diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index b7a576954f..817e2aa343 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -2668,21 +2668,18 @@ namespace Microsoft.AspNetCore.SignalR.Tests var hubActivator = serviceProvider.GetService>() as CustomHubActivator; - // OnConnectedAsync and SimpleMethod hubs have been disposed at this point - Assert.Equal(2, hubActivator.ReleaseCount); - await client.SendHubMessageAsync(new CancelInvocationMessage(streamInvocationId)).OrTimeout(); // Completion message for canceled Stream await client.ReadAsync().OrTimeout(); - // Stream method is now disposed - Assert.Equal(3, hubActivator.ReleaseCount); - // Shut down client.Dispose(); await connectionHandlerTask.OrTimeout(); + + // OnConnectedAsync, SimpleMethod, LongRunningStream, OnDisconnectedAsync + Assert.Equal(4, hubActivator.ReleaseCount); } } }