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

Revert "Remove check for above debug logs" 

This reverts commit 38a4560e1c.
This commit is contained in:
David Fowler 2018-02-17 09:40:42 -08:00
parent 38a4560e1c
commit da6325251e
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/Kestrel.FunctionalTests/RequestTests.cs
View File

@ -269,6 +269,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
var connectionStarted = new SemaphoreSlim(0); var connectionStarted = new SemaphoreSlim(0);
var connectionReset = new SemaphoreSlim(0); var connectionReset = new SemaphoreSlim(0);
var loggedHigherThanDebug = false;
var mockLogger = new Mock<ILogger>(); var mockLogger = new Mock<ILogger>();
mockLogger mockLogger
@ -286,6 +287,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
connectionReset.Release(); connectionReset.Release();
} }
if (logLevel > LogLevel.Debug)
{
loggedHigherThanDebug = true;
}
}); });
var mockLoggerFactory = new Mock<ILoggerFactory>(); var mockLoggerFactory = new Mock<ILoggerFactory>();
@ -315,12 +321,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// and therefore not logged. // and therefore not logged.
Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout)); Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout));
} }
Assert.False(loggedHigherThanDebug);
} }
[Fact] [Fact]
public async Task ConnectionResetBetweenRequestsIsLoggedAsDebug() public async Task ConnectionResetBetweenRequestsIsLoggedAsDebug()
{ {
var connectionReset = new SemaphoreSlim(0); var connectionReset = new SemaphoreSlim(0);
var loggedHigherThanDebug = false;
var mockLogger = new Mock<ILogger>(); var mockLogger = new Mock<ILogger>();
mockLogger mockLogger
@ -334,6 +343,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
connectionReset.Release(); connectionReset.Release();
} }
if (logLevel > LogLevel.Debug)
{
loggedHigherThanDebug = true;
}
}); });
var mockLoggerFactory = new Mock<ILoggerFactory>(); var mockLoggerFactory = new Mock<ILoggerFactory>();
@ -375,6 +389,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// and therefore not logged. // and therefore not logged.
Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout)); Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout));
} }
Assert.False(loggedHigherThanDebug);
} }
[Fact] [Fact]
@ -383,6 +399,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
var requestStarted = new SemaphoreSlim(0); var requestStarted = new SemaphoreSlim(0);
var connectionReset = new SemaphoreSlim(0); var connectionReset = new SemaphoreSlim(0);
var connectionClosing = new SemaphoreSlim(0); var connectionClosing = new SemaphoreSlim(0);
var loggedHigherThanDebug = false;
var mockLogger = new Mock<ILogger>(); var mockLogger = new Mock<ILogger>();
mockLogger mockLogger
@ -398,6 +415,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
connectionReset.Release(); connectionReset.Release();
} }
if (logLevel > LogLevel.Debug)
{
loggedHigherThanDebug = true;
}
}); });
var mockLoggerFactory = new Mock<ILoggerFactory>(); var mockLoggerFactory = new Mock<ILoggerFactory>();
@ -435,6 +457,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout), "Connection reset event should have been logged"); Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout), "Connection reset event should have been logged");
connectionClosing.Release(); connectionClosing.Release();
} }
Assert.False(loggedHigherThanDebug, "Logged event should not have been higher than debug.");
} }
[Fact] [Fact]