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

Fix tests not running as expected (#1080)

This commit is contained in:
BrennanConroy 2017-05-22 15:16:35 -07:00 committed by GitHub
parent b6f558d60b
commit c8bf886e92
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
View File

@ -203,10 +203,12 @@ namespace Microsoft.AspNetCore.Hosting
var server = new Mock<IServer>(); var server = new Mock<IServer>();
server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>())) server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>()))
.Returns(Task.CompletedTask) .Returns<CancellationToken>(token =>
.Callback<CancellationToken>(token =>
{ {
token.WaitHandle.WaitOne(); return Task.Run(() =>
{
token.WaitHandle.WaitOne();
});
}); });
using (var host = CreateBuilder(config) using (var host = CreateBuilder(config)
@ -240,10 +242,12 @@ namespace Microsoft.AspNetCore.Hosting
var server = new Mock<IServer>(); var server = new Mock<IServer>();
server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>())) server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>()))
.Returns(Task.CompletedTask) .Returns<CancellationToken>(token =>
.Callback<CancellationToken>(token =>
{ {
token.WaitHandle.WaitOne(); return Task.Run(() =>
{
token.WaitHandle.WaitOne();
});
}); });
using (var host = CreateBuilder(config) using (var host = CreateBuilder(config)
@ -274,10 +278,12 @@ namespace Microsoft.AspNetCore.Hosting
var server = new Mock<IServer>(); var server = new Mock<IServer>();
server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>())) server.Setup(s => s.StopAsync(It.IsAny<CancellationToken>()))
.Returns(Task.CompletedTask) .Returns<CancellationToken>(token =>
.Callback<CancellationToken>(token =>
{ {
token.WaitHandle.WaitOne(); return Task.Run(() =>
{
token.WaitHandle.WaitOne();
});
}); });
using (var host = CreateBuilder(config) using (var host = CreateBuilder(config)