Merge pull request #3398 from minrk/tornado5

Get tests running with tornado 5

Author: minrk

.travis.yml

@@ -35,19 +35,13 @@ before_install:
       if [[ $GROUP == js* ]]; then
         npm install -g [email protected] [email protected]
       fi
-    - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
     - |
       if [[ $GROUP == docs ]]; then
         pip install -r docs/doc-requirements.txt
       fi
 
 install:
-    - pip install -f travis-wheels/wheelhouse file://$PWD#egg=notebook[test]
-    - |
-      if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-        # Work around https://github.com/ipython/ipykernel/issues/288
-        pip install ipykernel==4.6.1
-      fi
+    - pip install --pre .[test]
     - wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb && sudo dpkg -i pandoc-1.19.1-1-amd64.deb
 
 

notebook/services/kernels/tests/test_kernels_api.py

@@ -53,11 +53,12 @@ def restart(self, id):
 
     def websocket(self, id):
         loop = IOLoop()
+        loop.make_current()
         req = HTTPRequest(
             url_path_join(self.base_url.replace('http', 'ws', 1), 'api/kernels', id, 'channels'),
             headers=self.headers,
         )
-        f = websocket_connect(req, io_loop=loop)
+        f = websocket_connect(req)
         return loop.run_sync(lambda : f)
 
 

notebook/tests/launchnotebook.py

@@ -135,6 +135,9 @@ def tmp(*parts):
 
         started = Event()
         def start_thread():
+            if 'asyncio' in sys.modules:
+                import asyncio
+                asyncio.set_event_loop(asyncio.new_event_loop())
             app = cls.notebook = NotebookApp(
                 port=cls.port,
                 port_retries=0,