From c79458a2825096d90d630c0266708dbe7cc5a0b4 Mon Sep 17 00:00:00 2001 From: Chris R Date: Wed, 10 Feb 2016 13:38:06 -0800 Subject: [PATCH] React to changes in System.Net.Sockets.TcpClient. --- .../ServerTests.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs index 37660b5380..2c95f450bb 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs @@ -204,16 +204,14 @@ namespace Microsoft.AspNetCore.Server.WebListener { // Note: System.Net.Sockets does not RST the connection by default, it just FINs. // Http.Sys's disconnect notice requires a RST. - using (Socket socket = await SendHungRequestAsync("GET", address)) + using (var client = await SendHungRequestAsync("GET", address)) { Assert.True(received.WaitOne(interval), "Receive Timeout"); // Force a RST - socket.LingerState = new LingerOption(true, 0); - socket.Dispose(); - - aborted.Set(); + client.LingerState = new LingerOption(true, 0); } + aborted.Set(); Assert.True(canceled.WaitOne(interval), "canceled"); } } @@ -240,10 +238,10 @@ namespace Microsoft.AspNetCore.Server.WebListener return Task.FromResult(0); })) { - using (Socket socket = await SendHungRequestAsync("GET", address)) + using (var client = await SendHungRequestAsync("GET", address)) { Assert.True(received.WaitOne(interval), "Receive Timeout"); - Assert.Throws(() => socket.Receive(new byte[10])); + Assert.Throws(() => client.GetStream().Read(new byte[10], 0, 10)); } } } @@ -287,7 +285,7 @@ namespace Microsoft.AspNetCore.Server.WebListener } } - private async Task SendHungRequestAsync(string method, string address) + private async Task SendHungRequestAsync(string method, string address) { // Connect with a socket Uri uri = new Uri(address); @@ -302,8 +300,7 @@ namespace Microsoft.AspNetCore.Server.WebListener byte[] requestBytes = BuildGetRequest(method, uri); await stream.WriteAsync(requestBytes, 0, requestBytes.Length); - // Return the opaque network stream - return client.Client; + return client; } catch (Exception) {