huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#270 Fix hang in SendFile tests

This commit is contained in:
Chris Ross 2017-10-16 10:03:20 -07:00
parent 7f96eab775
commit 748afb1f65
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
View File

@ -510,7 +510,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
} }
} }
[ConditionalFact(Skip = "Tests hanging: https://github.com/aspnet/HttpSysServer/issues/270")] [ConditionalFact]
public async Task ResponseSendFileExceptions_ClientDisconnectsBeforeSecondSend_SendThrows() public async Task ResponseSendFileExceptions_ClientDisconnectsBeforeSecondSend_SendThrows()
{ {
string address; string address;
@ -524,10 +524,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
// First write sends headers // First write sends headers
await context.Response.SendFileAsync(AbsoluteFilePath, 0, null, CancellationToken.None); var sendFileTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, CancellationToken.None);
var response = await responseTask; var response = await responseTask;
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
// Drain data from the connection so that SendFileAsync can complete.
var bufferTask = response.Content.LoadIntoBufferAsync();
await sendFileTask;
response.Dispose(); response.Dispose();
} }
@ -544,7 +548,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
} }
} }
[ConditionalFact(Skip = "Tests hanging: https://github.com/aspnet/WebListener/issues/270")] [ConditionalFact]
public async Task ResponseSendFile_ClientDisconnectsBeforeSecondSend_SendCompletesSilently() public async Task ResponseSendFile_ClientDisconnectsBeforeSecondSend_SendCompletesSilently()
{ {
string address; string address;
@ -557,10 +561,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
// First write sends headers // First write sends headers
await context.Response.SendFileAsync(AbsoluteFilePath, 0, null, CancellationToken.None); var sendFileTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, CancellationToken.None);
var response = await responseTask; var response = await responseTask;
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
// Drain data from the connection so that SendFileAsync can complete.
var bufferTask = response.Content.LoadIntoBufferAsync();
await sendFileTask;
response.Dispose(); response.Dispose();
} }