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

Fix HeartbeatTests flakiness (#2268)

This commit is contained in:
Stephen Halter 2018-01-23 10:58:22 -08:00 committed by GitHub
parent 526dfdb332
commit ee1c5c440c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/Kestrel.Core.Tests/HeartbeatTests.cs
View File

@ -30,6 +30,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
var kestrelTrace = new Mock<IKestrelTrace>(); var kestrelTrace = new Mock<IKestrelTrace>();
var handlerMre = new ManualResetEventSlim(); var handlerMre = new ManualResetEventSlim();
var traceMre = new ManualResetEventSlim(); var traceMre = new ManualResetEventSlim();
var onHeartbeatTasks = new Task[2];
heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Callback(() => handlerMre.Wait()); heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Callback(() => handlerMre.Wait());
debugger.Setup(d => d.IsAttached).Returns(false); debugger.Setup(d => d.IsAttached).Returns(false);
@ -37,12 +38,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
using (var heartbeat = new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, debugger.Object, kestrelTrace.Object)) using (var heartbeat = new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, debugger.Object, kestrelTrace.Object))
{ {
Task.Run(() => heartbeat.OnHeartbeat()); onHeartbeatTasks[0] = Task.Run(() => heartbeat.OnHeartbeat());
Task.Run(() => heartbeat.OnHeartbeat()); onHeartbeatTasks[1] = Task.Run(() => heartbeat.OnHeartbeat());
Assert.True(traceMre.Wait(TimeSpan.FromSeconds(10))); Assert.True(traceMre.Wait(TimeSpan.FromSeconds(10)));
} }
handlerMre.Set(); handlerMre.Set();
Task.WaitAll(onHeartbeatTasks);
heartbeatHandler.Verify(h => h.OnHeartbeat(systemClock.UtcNow), Times.Once()); heartbeatHandler.Verify(h => h.OnHeartbeat(systemClock.UtcNow), Times.Once());
kestrelTrace.Verify(t => t.HeartbeatSlow(Heartbeat.Interval, systemClock.UtcNow), Times.Once()); kestrelTrace.Verify(t => t.HeartbeatSlow(Heartbeat.Interval, systemClock.UtcNow), Times.Once());
@ -57,6 +59,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
var kestrelTrace = new Mock<IKestrelTrace>(); var kestrelTrace = new Mock<IKestrelTrace>();
var handlerMre = new ManualResetEventSlim(); var handlerMre = new ManualResetEventSlim();
var traceMre = new ManualResetEventSlim(); var traceMre = new ManualResetEventSlim();
var onHeartbeatTasks = new Task[2];
heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Callback(() => handlerMre.Wait()); heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Callback(() => handlerMre.Wait());
debugger.Setup(d => d.IsAttached).Returns(true); debugger.Setup(d => d.IsAttached).Returns(true);
@ -64,12 +67,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
using (var heartbeat = new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, debugger.Object, kestrelTrace.Object)) using (var heartbeat = new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, debugger.Object, kestrelTrace.Object))
{ {
Task.Run(() => heartbeat.OnHeartbeat()); onHeartbeatTasks[0] = Task.Run(() => heartbeat.OnHeartbeat());
Task.Run(() => heartbeat.OnHeartbeat()); onHeartbeatTasks[1] = Task.Run(() => heartbeat.OnHeartbeat());
Assert.False(traceMre.Wait(TimeSpan.FromSeconds(10))); Assert.False(traceMre.Wait(TimeSpan.FromSeconds(10)));
} }
handlerMre.Set(); handlerMre.Set();
Task.WaitAll(onHeartbeatTasks);
heartbeatHandler.Verify(h => h.OnHeartbeat(systemClock.UtcNow), Times.Once()); heartbeatHandler.Verify(h => h.OnHeartbeat(systemClock.UtcNow), Times.Once());
kestrelTrace.Verify(t => t.HeartbeatSlow(Heartbeat.Interval, systemClock.UtcNow), Times.Never()); kestrelTrace.Verify(t => t.HeartbeatSlow(Heartbeat.Interval, systemClock.UtcNow), Times.Never());