Skip to content

Commit 234d09d

Browse files
committed
Fix gateway kernelspec tests to updated JKM call
1 parent a2ab44e commit 234d09d

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

appveyor.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ install:
2323
- cmd: pip install git+https://github.com/gateway-experiments/jupyter_kernel_mgmt.git@fix-windows
2424

2525
test_script:
26-
- nosetests -v jupyter_server --exclude-dir notebook\tests\selenium
26+
- nosetests -v jupyter_server.services.kernels.tests
27+
- nosetests -v jupyter_server.tests.test_utils
28+
#- nosetests -v jupyter_server --exclude-dir notebook\tests\selenium

jupyter_server/gateway/managers.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Copyright (c) Jupyter Development Team.
22
# Distributed under the terms of the Modified BSD License.
3-
3+
import asyncio
44
import os
55
import json
66
import logging
77

88
from jupyter_kernel_mgmt.discovery import KernelFinder
99
from socket import gaierror
1010
from tornado import gen, web
11+
from tornado.concurrent import Future
1112
from tornado.escape import json_encode, json_decode, url_escape
1213
from tornado.httpclient import HTTPClient, AsyncHTTPClient, HTTPError
1314

@@ -519,15 +520,13 @@ def _get_kernelspecs_endpoint_url(self, kernel_name=None):
519520

520521
return self.base_endpoint
521522

522-
@gen.coroutine
523+
@asyncio.coroutine
523524
def find_kernels(self):
524-
remote_kspecs_list = []
525-
remote_kspecs = yield maybe_future(self.get_all_specs())
525+
remote_kspecs = yield from self.get_all_specs()
526+
526527
# convert to list of 2 tuples
527528
for kernel_type, attributes in remote_kspecs.items():
528-
remote_kspecs_list.append((kernel_type, attributes))
529-
530-
raise gen.Return(remote_kspecs_list)
529+
yield kernel_type, attributes
531530

532531
@gen.coroutine
533532
def get_all_specs(self):

0 commit comments

Comments
 (0)