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

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-15 00:27:56 +00:00
parent 97ee5cbcac 019ba081d3
commit 918dc51a1f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
View File

@ -1274,7 +1274,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
}
await Assert.ThrowsAsync<TaskCanceledException>(async () => await readTcs.Task);
var thrownEx = await Assert.ThrowsAnyAsync<Exception>(async () => await readTcs.Task);
// https://github.com/aspnet/AspNetCore-Internal/issues/1521
// In more recent versions of Kestrel, we expect this to always be a TaskCanceledException,
// but without the changes in https://github.com/aspnet/KestrelHttpServer/pull/2844, this is flaky.
Assert.True(thrownEx is TaskCanceledException || thrownEx is IOException, $"{thrownEx} is neither a TaskCanceledException nor IOException.");
// The cancellation token for only the last request should be triggered.
var abortedRequestId = await registrationTcs.Task;