Skip to content

Commit 29a650b

Browse files
committed
Fix SessionHandler call to start kernel
1 parent fa2d6b3 commit 29a650b

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

jupyter_server/services/sessions/handlers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ def patch(self, session_id):
132132
changes['kernel_id'] = kernel_id
133133
elif model['kernel'].get('name') is not None:
134134
kernel_name = model['kernel']['name']
135-
kernel_id = sm.start_kernel_for_session(
135+
kernel_id = yield maybe_future(sm.start_kernel_for_session(
136136
session_id, kernel_name=kernel_name, name=before['name'],
137-
path=before['path'], type=before['type'])
137+
path=before['path'], type=before['type']))
138138
changes['kernel_id'] = kernel_id
139139

140140
yield maybe_future(sm.update_session(session_id, **changes))

jupyter_server/services/sessions/tests/test_sessions_api.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,15 @@ def test_create(self):
132132
sid = newsession['id']
133133
got = self.sess_api.get(sid).json()
134134

135-
# Kernel state may have changed from 'starting' to 'idle'
136-
del got['kernel']['execution_state']
137-
del newsession['kernel']['execution_state']
135+
# Kernel state may have changed from 'starting' to 'idle',
136+
# but let's only clean up if that's the case
137+
if got['kernel']['execution_state'] == 'starting' and newsession['kernel']['execution_state'] == 'idle':
138+
del got['kernel']['execution_state']
139+
del newsession['kernel']['execution_state']
140+
# include their last_activity as well
141+
del got['kernel']['last_activity']
142+
del newsession['kernel']['last_activity']
143+
138144
self.assertEqual(got, newsession)
139145

140146
def test_create_file_session(self):

0 commit comments

Comments
 (0)