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

Fix hanging functional tests.

This commit is contained in:
Cesar Blum Silveira 2016-08-05 16:46:34 -07:00
parent fa41588779
commit 55f409b38b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs
View File

@ -36,16 +36,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
// Close socket immediately // Close socket immediately
} }
}
await loggerFactory.FilterLogger.LogTcs.Task; await loggerFactory.FilterLogger.LogTcs.Task.TimeoutAfter(TimeSpan.FromSeconds(10));
}
Assert.Equal(1, loggerFactory.FilterLogger.LastEventId.Id); Assert.Equal(1, loggerFactory.FilterLogger.LastEventId.Id);
Assert.Equal(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel); Assert.Equal(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel);
Assert.Equal(0, loggerFactory.ErrorLogger.TotalErrorsLogged); Assert.Equal(0, loggerFactory.ErrorLogger.TotalErrorsLogged);
} }
[Fact] [Fact]
public async Task ClientHandshakeFailureLoggedAsInformation() public async Task ClientHandshakeFailureLoggedAsInformation()
{ {
@ -70,9 +69,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// Send null bytes and close socket // Send null bytes and close socket
await stream.WriteAsync(new byte[10], 0, 10); await stream.WriteAsync(new byte[10], 0, 10);
} }
}
await loggerFactory.FilterLogger.LogTcs.Task; await loggerFactory.FilterLogger.LogTcs.Task.TimeoutAfter(TimeSpan.FromSeconds(10));
}
Assert.Equal(1, loggerFactory.FilterLogger.LastEventId.Id); Assert.Equal(1, loggerFactory.FilterLogger.LastEventId.Id);
Assert.Equal(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel); Assert.Equal(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel);
@ -94,7 +93,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
return ErrorLogger; return ErrorLogger;
} }
} }
public void AddProvider(ILoggerProvider provider) public void AddProvider(ILoggerProvider provider)