Fixed hanging tests.

dotnet · Jun 23, 2020 · 96eccce · 96eccce
1 parent 7e5c47d
commit 96eccce
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs
@@ -872,12 +872,12 @@ public async Task Send_TimeoutRequestContent_Throws()
             await LoopbackServer.CreateClientAndServerAsync(
                 async uri =>
                 {
-                    try
-                    {
-                        var sendTask = Task.Run(() => {
-                            using HttpClient httpClient = CreateHttpClient();
-                            httpClient.Timeout = TimeSpan.FromSeconds(0.5);
+                    var sendTask = Task.Run(() => {
+                        using HttpClient httpClient = CreateHttpClient();
+                        httpClient.Timeout = TimeSpan.FromSeconds(0.5);
 
+                        try 
+                        {
                             HttpResponseMessage response = httpClient.Send(new HttpRequestMessage(HttpMethod.Get, uri) {
                                 Content = new CustomContent(new Action<Stream>(stream =>
                                 {
@@ -888,15 +888,15 @@ await LoopbackServer.CreateClientAndServerAsync(
                                     }
                                 }))
                             });
-                        });
+                        }
+                        finally
+                        {
+                            mres.Set();
+                        }
+                    });
 
-                        TaskCanceledException ex = await Assert.ThrowsAsync<TaskCanceledException>(() => sendTask);
-                        Assert.IsType<TimeoutException>(ex.InnerException);
-                    }
-                    finally
-                    {
-                        mres.Set();
-                    }
+                    TaskCanceledException ex = await Assert.ThrowsAsync<TaskCanceledException>(() => sendTask);
+                    Assert.IsType<TimeoutException>(ex.InnerException);
                 },
                 async server =>
                 { 
@@ -966,22 +966,21 @@ public async Task Send_TimeoutResponseContent_Throws()
             await LoopbackServer.CreateClientAndServerAsync(
                 async uri =>
                 {
-                    try
-                    {
-                        var sendTask = Task.Run(() => {
-                            using HttpClient httpClient = CreateHttpClient();
-                            httpClient.Timeout = TimeSpan.FromSeconds(0.5);
-
+                    var sendTask = Task.Run(() => {
+                        using HttpClient httpClient = CreateHttpClient();
+                        httpClient.Timeout = TimeSpan.FromSeconds(0.5);
+                        try
+                        {
                             HttpResponseMessage response = httpClient.Send(new HttpRequestMessage(HttpMethod.Get, uri));
-                        });
+                        }
+                        finally
+                        {
+                            mres.Set();
+                        }
+                    });
 
-                        TaskCanceledException ex = await Assert.ThrowsAsync<TaskCanceledException>(() => sendTask);
-                        Assert.IsType<TimeoutException>(ex.InnerException);
-                    }
-                    finally
-                    {
-                        mres.Set();
-                    }
+                    TaskCanceledException ex = await Assert.ThrowsAsync<TaskCanceledException>(() => sendTask);
+                    Assert.IsType<TimeoutException>(ex.InnerException);
                 },
                 async server =>
                 {