fix EventQueueTimeout test

Author: analogrelay

SignalR.sln

@@ -26,7 +26,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A35B453-52EC-48AF-89CA-D4A69800F131}"
 	ProjectSection(SolutionItems) = preProject
 		test\Directory.Build.props = test\Directory.Build.props
-		test\xunit.runner.json = test\xunit.runner.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Tests", "test\Microsoft.AspNetCore.Sockets.Tests\Microsoft.AspNetCore.Sockets.Tests.csproj", "{AAD719D5-5E31-4ED1-A60F-6EB92EFA66D9}"
@@ -86,7 +85,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtSample", "samples\JwtSam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtClientSample", "samples\JwtClientSample\JwtClientSample.csproj", "{1A953296-E869-4DE2-A693-FD5FCDE27057}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SignalR.Tests.Utils", "test\Microsoft.AspNetCore.SignalR.Tests.Utils\Microsoft.AspNetCore.SignalR.Tests.Utils.csproj", "{0A0A6135-EA24-4307-95C2-CE1B7E164A5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests.Utils", "test\Microsoft.AspNetCore.SignalR.Tests.Utils\Microsoft.AspNetCore.SignalR.Tests.Utils.csproj", "{0A0A6135-EA24-4307-95C2-CE1B7E164A5E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs

@@ -191,7 +191,6 @@ private async Task StartAsyncInternal()
                     await _receiveLoopTask;
 
                     _logger.DrainEvents(_connectionId);
-                    await _eventQueue.Drain();
 
                     await Task.WhenAny(_eventQueue.Drain().NoThrow(), Task.Delay(_eventQueueDrainTimeout));
 

test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs

@@ -2,6 +2,7 @@
 // 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.Net;
 using System.Net.Http;
 using System.Text;
@@ -625,21 +626,27 @@ public async Task EventQueueTimeout()
                 mockTransport.SetupGet(t => t.Mode).Returns(TransferMode.Text);
 
                 var blockReceiveCallbackTcs = new TaskCompletionSource<object>();
+                var onReceivedCalledTcs = new TaskCompletionSource<object>();
 
                 var connection = new HttpConnection(new Uri("http://fakeuri.org/"), new TestTransportFactory(mockTransport.Object), loggerFactory,
                     httpOptions: new HttpOptions { HttpMessageHandler = mockHttpHandler.Object });
-                connection.OnReceived(_ => blockReceiveCallbackTcs.Task);
+                connection.OnReceived(async _ =>
+                {
+                    onReceivedCalledTcs.TrySetResult(null);
+                    await blockReceiveCallbackTcs.Task;
+                });
 
                 logger.LogInformation("Starting connection");
                 await connection.StartAsync().OrTimeout();
                 logger.LogInformation("Started connection");
                 channel.Writer.TryWrite(Array.Empty<byte>());
+                await onReceivedCalledTcs.Task.OrTimeout();
 
                 // Ensure that SignalR isn't blocked by the receive callback
                 Assert.False(channel.Reader.TryRead(out var message));
 
                 logger.LogInformation("Disposing connection");
-                await connection.DisposeAsync().OrTimeout();
+                await connection.DisposeAsync().OrTimeout(TimeSpan.FromSeconds(10));
                 logger.LogInformation("Disposed connection");
             }
         }

test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs

@@ -86,7 +86,7 @@ public async Task SSETransportStopsSendAndReceiveLoopsWhenTransportStopped()
                             var buffer = Encoding.ASCII.GetBytes("data: 3:abc\r\n\r\n");
                             while (!eventStreamCts.IsCancellationRequested)
                             {
-                                await stream.WriteAsync(buffer, 0, buffer.Length);
+                                await stream.WriteAsync(buffer, 0, buffer.Length).OrTimeout();
                             }
                         });
                     mockStream.Setup(s => s.CanRead).Returns(true);