Merge in 'release/2.1' changes

2018-12-07 23:46:01 +00:00 · 2018-12-07 23:46:01 +00:00 · 6169f4dd59
parent c3e0703f9b 4c5debd6ea
commit 6169f4dd59
1 changed files with 1 additions and 1 deletions
--- a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
+++ b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest

        // Skip if wstest is not installed for now, see https://github.com/aspnet/WebSockets/issues/95
        // We will enable Wstest on every build once we've gotten the necessary infrastructure sorted out :).
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/4350")]
        [SkipIfWsTestNotPresent]
        public async Task AutobahnTestSuite()
        {