Clean up

Author: JamesNK

src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs

@@ -400,20 +400,24 @@ public async Task Http1Connection_ServerAbort_HasErrorType()
         var serviceContext = new TestServiceContext(LoggerFactory, metrics: new KestrelMetrics(testMeterFactory));
 
         var sendString = "POST / HTTP/1.0\r\nContent-Length: 12\r\n\r\nHello World?";
-        var readBodyTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var finishedSendingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
         await using var server = new TestServer(async c =>
         {
             await c.Request.Body.ReadUntilEndAsync();
-            readBodyTcs.SetResult();
+
+            // An extra check to ensure that client is done sending before the server aborts.
+            // This might not be necessary since we're reading to the end of the request body, but it doesn't hurt.
+            await finishedSendingTcs.Task;
+
             c.Abort();
         }, serviceContext);
 
         using (var connection = server.CreateConnection())
         {
             await connection.Send(sendString).DefaultTimeout();
 
-            await readBodyTcs.Task.DefaultTimeout();
+            finishedSendingTcs.SetResult();
 
             await connection.ReceiveEnd().DefaultTimeout();