From dc8d1d078827ad733afc668ac6fe2c716545969f Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Wed, 16 Aug 2017 19:30:36 -0700
Subject: [PATCH] Do not block on async calls

---
 .../Listener/ResponseSendFileTests.cs                       | 2 +-
 .../OpaqueUpgradeTests.cs                                   | 2 +-
 .../ResponseBodyTests.cs                                    | 4 ++--
 .../ResponseSendFileTests.cs                                | 2 +-
 .../ServerTests.cs                                          | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
index f8d94e1087..fb0b739295 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
@@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 Assert.True(response.Content.Headers.TryGetValues("content-length", out contentLength), "Content-Length");
                 Assert.Equal(FileLength.ToString(), contentLength.First());
                 Assert.Null(response.Headers.TransferEncodingChunked);
-                Assert.Equal(FileLength, response.Content.ReadAsByteArrayAsync().Result.Length);
+                Assert.Equal(FileLength, (await response.Content.ReadAsByteArrayAsync()).Length);
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/OpaqueUpgradeTests.cs
index a37daceb04..c0fdda0dd2 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/OpaqueUpgradeTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/OpaqueUpgradeTests.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal(200, (int)response.StatusCode);
                 Assert.False(response.Headers.TransferEncodingChunked.HasValue, "Chunked");
                 Assert.Equal(0, response.Content.Headers.ContentLength);
-                Assert.Equal(string.Empty, response.Content.ReadAsStringAsync().Result);
+                Assert.Equal(string.Empty, await response.Content.ReadAsStringAsync());
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs
index 4c3089edea..a42071b342 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs
@@ -122,7 +122,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         }
 
         [ConditionalFact]
-        public void ResponseBody_WriteContentLengthNotEnoughWritten_Throws()
+        public async Task ResponseBody_WriteContentLengthNotEnoughWritten_Throws()
         {
             string address;
             using (Utilities.CreateHttpServer(out address, httpContext =>
@@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 return httpContext.Response.Body.WriteAsync(new byte[5], 0, 5);
             }))
             {
-                Assert.Throws<AggregateException>(() => SendRequestAsync(address).Result);
+                await Assert.ThrowsAsync<HttpRequestException>(async () => await SendRequestAsync(address));
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseSendFileTests.cs
index 09fd9c3b86..02117c6b53 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseSendFileTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseSendFileTests.cs
@@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.True(response.Content.Headers.TryGetValues("content-length", out contentLength), "Content-Length");
                 Assert.Equal(FileLength.ToString(), contentLength.First());
                 Assert.Null(response.Headers.TransferEncodingChunked);
-                Assert.Equal(FileLength, response.Content.ReadAsByteArrayAsync().Result.Length);
+                Assert.Equal(FileLength, (await response.Content.ReadAsByteArrayAsync()).Length);
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ServerTests.cs
index 01224b2bc6..9e5bc9e444 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ServerTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ServerTests.cs
@@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         }
 
         [ConditionalFact]
-        public void Server_AppException_ClientReset()
+        public async Task Server_AppException_ClientReset()
         {
             string address;
             using (Utilities.CreateHttpServer(out address, httpContext =>
@@ -144,11 +144,11 @@ namespace Microsoft.AspNetCore.Server.HttpSys
             }))
             {
                 Task<string> requestTask = SendRequestAsync(address);
-                Assert.Throws<AggregateException>(() => requestTask.Result);
+                await Assert.ThrowsAsync<HttpRequestException>(async () => await requestTask);
 
                 // Do it again to make sure the server didn't crash
                 requestTask = SendRequestAsync(address);
-                Assert.Throws<AggregateException>(() => requestTask.Result);
+                await Assert.ThrowsAsync<HttpRequestException>(async () => await requestTask);
             }
         }