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

React to kestrel merge conflict (#12624)

This commit is contained in:
Chris Ross 2019-07-26 11:55:37 -07:00 committed by John Luo
parent a0e0338d7e
commit 922fd9cb0d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
View File

@ -344,7 +344,7 @@ namespace Interop.FunctionalTests
Assert.True(sequence.IsSingleSegment); Assert.True(sequence.IsSingleSegment);
await context.Response.BodyWriter.WriteAsync(sequence.First).DefaultTimeout(); await context.Response.BodyWriter.WriteAsync(sequence.First).DefaultTimeout();
reader.AdvanceTo(sequence.End); reader.AdvanceTo(sequence.End);
await context.Features.Get<IHttpResponseCompletionFeature>().CompleteAsync(); await context.Response.CompleteAsync().DefaultTimeout();
try try
{ {
@ -417,7 +417,7 @@ namespace Interop.FunctionalTests
// var readTask = context.Request.BodyReader.ReadAsync(); // var readTask = context.Request.BodyReader.ReadAsync();
context.Response.ContentType = "text/plain"; context.Response.ContentType = "text/plain";
await context.Response.WriteAsync("Hello World"); await context.Response.WriteAsync("Hello World");
await context.Features.Get<IHttpResponseCompletionFeature>().CompleteAsync().DefaultTimeout(); await context.Response.CompleteAsync().DefaultTimeout();
try try
{ {