From 66d8e8198dc91cd58f3ad170c2d232ecd03b6cb5 Mon Sep 17 00:00:00 2001
From: Cesar Blum Silveira <cesarbs@gmail.com>
Date: Thu, 7 Sep 2017 17:24:33 -0700
Subject: [PATCH] Re-enable TestKeepAliveTimeout.

---
 test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs b/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs
index b9a7d049b1..e43b99d7d0 100644
--- a/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs
+++ b/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs
@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 {
@@ -20,10 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
         private static readonly TimeSpan LongDelay = TimeSpan.FromSeconds(30);
         private static readonly TimeSpan ShortDelay = TimeSpan.FromSeconds(LongDelay.TotalSeconds / 10);
 
-        // This test is particularly flaky on some teamcity agents, so skip there for now.
-        // https://github.com/aspnet/KestrelHttpServer/issues/1684
-        [ConditionalFact]
-        [EnvironmentVariableSkipCondition("TEAMCITY_VERSION", null)]
+        [Fact]
         public Task TestKeepAliveTimeout()
         {
             // Delays in these tests cannot be much longer than expected.