From b6f558d60b130d7f8892bed7d1a5b72f575fdc28 Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Fri, 19 May 2017 16:40:41 -0700
Subject: [PATCH] Fix flaxy test (#1079)

---
 test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
index 8bbd0bf3f4..888ba0cdcd 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
@@ -158,8 +158,8 @@ namespace Microsoft.AspNetCore.Hosting
             }
         }
 
-        [Fact (Skip="https://github.com/aspnet/Hosting/issues/1024")]
-        public void WebHostShutsDownWhenTokenTriggers()
+        [Fact]
+        public async Task WebHostShutsDownWhenTokenTriggers()
         {
             using (var host = CreateBuilder()
                 .UseFakeServer()
@@ -184,6 +184,9 @@ namespace Microsoft.AspNetCore.Hosting
                 // Wait on the host to shutdown
                 lifetime.ApplicationStopped.WaitHandle.WaitOne();
 
+                // Wait for RunAsync to finish to guarantee Disposal of WebHost
+                await runInBackground;
+
                 Assert.Equal(1, server.StartInstances[0].DisposeCalls);
             }
         }