From 55f409b38b43b870c3a4c907ed5c9c0a8f9a2c52 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Fri, 5 Aug 2016 16:46:34 -0700 Subject: [PATCH] Fix hanging functional tests. --- .../HttpsTests.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs index 2fa1838195..775e2c6a01 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs @@ -36,16 +36,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { // 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(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel); Assert.Equal(0, loggerFactory.ErrorLogger.TotalErrorsLogged); } - [Fact] public async Task ClientHandshakeFailureLoggedAsInformation() { @@ -70,9 +69,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Send null bytes and close socket 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(LogLevel.Information, loggerFactory.FilterLogger.LastLogLevel); @@ -94,7 +93,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { return ErrorLogger; } - } public void AddProvider(ILoggerProvider provider)