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

Include exceptions when displaying test logs (#2344)

This commit is contained in:
Stephen Halter 2018-02-23 22:22:00 -08:00 committed by David Fowler
parent de7e2a2573
commit 0134e56909
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/Kestrel.FunctionalTests/HttpsTests.cs
View File

@ -412,7 +412,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
if (logLevel == LogLevel.Error) if (logLevel == LogLevel.Error)
{ {
_errorMessages.Add(formatter(state, exception)); var log = $"Log {logLevel}[{eventId}]: {formatter(state, exception)} {exception?.Message}";
_errorMessages.Add(log);
} }
if (exception is ObjectDisposedException) if (exception is ObjectDisposedException)

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

@ -409,7 +409,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
.Setup(logger => logger.Log(It.IsAny<LogLevel>(), It.IsAny<EventId>(), It.IsAny<object>(), It.IsAny<Exception>(), It.IsAny<Func<object, Exception, string>>())) .Setup(logger => logger.Log(It.IsAny<LogLevel>(), It.IsAny<EventId>(), It.IsAny<object>(), It.IsAny<Exception>(), It.IsAny<Func<object, Exception, string>>()))
.Callback<LogLevel, EventId, object, Exception, Func<object, Exception, string>>((logLevel, eventId, state, exception, formatter) => .Callback<LogLevel, EventId, object, Exception, Func<object, Exception, string>>((logLevel, eventId, state, exception, formatter) =>
{ {
_output.WriteLine(logLevel + ": " + formatter(state, exception)); var log = $"Log {logLevel}[{eventId}]: {formatter(state, exception)} {exception?.Message}";
_output.WriteLine(log);
if (eventId.Id == _connectionResetEventId) if (eventId.Id == _connectionResetEventId)
{ {