From 20d8f1fca26844a1442d279fa3eba9e103cdeb6f Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Wed, 11 Jan 2017 16:36:48 -0800
Subject: [PATCH] fix autobahn test app to be an app (#114)

* fix autobahn test app to be an app
* remove net46 version of autobahn conformance test, the autobahn suite doesn't need to be run twice...
* add appveyor and travis support for autobahn
---
 .travis.yml                                                 | 6 +++++-
 appveyor.yml                                                | 3 +++
 .../AutobahnTests.cs                                        | 2 +-
 .../project.json                                            | 3 +--
 test/WebSocketsTestApp/project.json                         | 3 ++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0be886892..0a218b46bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ env:
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1
 mono:
   - 4.0.5
+python:
+  - "2.7"
 os:
   - linux
   - osx
@@ -27,6 +29,8 @@ branches:
     - dev
     - /^(.*\/)?ci-.*$/
 before_install:
-  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl python; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+install:
+  - sudo pip install autobahntestsuite "six>=1.9.0"
 script:
   - ./build.sh --quiet verify
diff --git a/appveyor.yml b/appveyor.yml
index 35e5ab6828..58632c78e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,9 @@ branches:
     - /^(.*\/)?ci-.*$/
 build_script:
   - build.cmd --quiet verify
+install:
+  - set PATH=C:\Python27\scripts;%PATH%
+  - pip install autobahntestsuite
 clone_depth: 1
 test: off
 deploy: off
diff --git a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/AutobahnTests.cs b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/AutobahnTests.cs
index 2014215c2d..e90384cff9 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/AutobahnTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/AutobahnTests.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest
 {
     public class AutobahnTests
     {
-        [ConditionalFact(Skip = "Failing test. See https://github.com/aspnet/SignalR/issues/23")]
+        [ConditionalFact]
         [SkipIfWsTestNotPresent]
         public async Task AutobahnTestSuite()
         {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json
index 263d477bf7..ce291fc9d3 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json
+++ b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json
@@ -21,7 +21,6 @@
           "type": "platform"
         }
       }
-    },
-    "net46": {}
+    }
   }
 }
diff --git a/test/WebSocketsTestApp/project.json b/test/WebSocketsTestApp/project.json
index 6a62469cf8..534ed1bd5f 100644
--- a/test/WebSocketsTestApp/project.json
+++ b/test/WebSocketsTestApp/project.json
@@ -24,7 +24,8 @@
     "net46": { }
   },
   "buildOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "emitEntryPoint": true
   },
   "runtimeOptions": {
     "configProperties": {