Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get tests running with tornado 5 #3398

Merged
merged 2 commits into from
Mar 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ 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
Expand All @@ -50,7 +49,7 @@ before_install:
fi

install:
- pip install -f travis-wheels/wheelhouse file://$PWD#egg=notebook[test]
- 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


Expand Down
3 changes: 2 additions & 1 deletion notebook/services/kernels/tests/test_kernels_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
3 changes: 3 additions & 0 deletions notebook/tests/launchnotebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down