Uploaded Test files
This commit is contained in:
parent
f584ad9d97
commit
2e81cb7d99
16627 changed files with 2065359 additions and 102444 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,256 @@
|
|||
"""Tests for the session manager."""
|
||||
|
||||
from functools import partial
|
||||
from unittest import TestCase
|
||||
|
||||
from tornado import gen, web
|
||||
from tornado.ioloop import IOLoop
|
||||
|
||||
from ..sessionmanager import SessionManager
|
||||
from notebook.services.kernels.kernelmanager import MappingKernelManager
|
||||
from notebook.services.contents.manager import ContentsManager
|
||||
from notebook._tz import utcnow, isoformat
|
||||
|
||||
class DummyKernel(object):
|
||||
def __init__(self, kernel_name='python'):
|
||||
self.kernel_name = kernel_name
|
||||
|
||||
dummy_date = utcnow()
|
||||
dummy_date_s = isoformat(dummy_date)
|
||||
|
||||
class DummyMKM(MappingKernelManager):
|
||||
"""MappingKernelManager interface that doesn't start kernels, for testing"""
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(DummyMKM, self).__init__(*args, **kwargs)
|
||||
self.id_letters = iter(u'ABCDEFGHIJK')
|
||||
|
||||
def _new_id(self):
|
||||
return next(self.id_letters)
|
||||
|
||||
def start_kernel(self, kernel_id=None, path=None, kernel_name='python', **kwargs):
|
||||
kernel_id = kernel_id or self._new_id()
|
||||
k = self._kernels[kernel_id] = DummyKernel(kernel_name=kernel_name)
|
||||
self._kernel_connections[kernel_id] = 0
|
||||
k.last_activity = dummy_date
|
||||
k.execution_state = 'idle'
|
||||
return kernel_id
|
||||
|
||||
def shutdown_kernel(self, kernel_id, now=False):
|
||||
del self._kernels[kernel_id]
|
||||
|
||||
|
||||
class TestSessionManager(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.sm = SessionManager(
|
||||
kernel_manager=DummyMKM(),
|
||||
contents_manager=ContentsManager(),
|
||||
)
|
||||
self.loop = IOLoop()
|
||||
self.addCleanup(partial(self.loop.close, all_fds=True))
|
||||
|
||||
def create_sessions(self, *kwarg_list):
|
||||
@gen.coroutine
|
||||
def co_add():
|
||||
sessions = []
|
||||
for kwargs in kwarg_list:
|
||||
kwargs.setdefault('type', 'notebook')
|
||||
session = yield self.sm.create_session(**kwargs)
|
||||
sessions.append(session)
|
||||
raise gen.Return(sessions)
|
||||
return self.loop.run_sync(co_add)
|
||||
|
||||
def create_session(self, **kwargs):
|
||||
return self.create_sessions(kwargs)[0]
|
||||
|
||||
def test_get_session(self):
|
||||
sm = self.sm
|
||||
session_id = self.create_session(path='/path/to/test.ipynb', kernel_name='bar')['id']
|
||||
model = self.loop.run_sync(lambda: sm.get_session(session_id=session_id))
|
||||
expected = {'id':session_id,
|
||||
'path': u'/path/to/test.ipynb',
|
||||
'notebook': {'path': u'/path/to/test.ipynb', 'name': None},
|
||||
'type': 'notebook',
|
||||
'name': None,
|
||||
'kernel': {
|
||||
'id': 'A',
|
||||
'name': 'bar',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}}
|
||||
self.assertEqual(model, expected)
|
||||
|
||||
def test_bad_get_session(self):
|
||||
# Should raise error if a bad key is passed to the database.
|
||||
sm = self.sm
|
||||
session_id = self.create_session(path='/path/to/test.ipynb',
|
||||
kernel_name='foo')['id']
|
||||
with self.assertRaises(TypeError):
|
||||
self.loop.run_sync(lambda: sm.get_session(bad_id=session_id)) # Bad keyword
|
||||
|
||||
def test_get_session_dead_kernel(self):
|
||||
sm = self.sm
|
||||
session = self.create_session(path='/path/to/1/test1.ipynb', kernel_name='python')
|
||||
# kill the kernel
|
||||
sm.kernel_manager.shutdown_kernel(session['kernel']['id'])
|
||||
with self.assertRaises(KeyError):
|
||||
self.loop.run_sync(lambda: sm.get_session(session_id=session['id']))
|
||||
# no sessions left
|
||||
listed = self.loop.run_sync(lambda: sm.list_sessions())
|
||||
self.assertEqual(listed, [])
|
||||
|
||||
def test_list_sessions(self):
|
||||
sm = self.sm
|
||||
sessions = self.create_sessions(
|
||||
dict(path='/path/to/1/test1.ipynb', kernel_name='python'),
|
||||
dict(path='/path/to/2/test2.py', type='file', kernel_name='python'),
|
||||
dict(path='/path/to/3', name='foo', type='console', kernel_name='python'),
|
||||
)
|
||||
|
||||
sessions = self.loop.run_sync(lambda: sm.list_sessions())
|
||||
expected = [
|
||||
{
|
||||
'id':sessions[0]['id'],
|
||||
'path': u'/path/to/1/test1.ipynb',
|
||||
'type': 'notebook',
|
||||
'notebook': {'path': u'/path/to/1/test1.ipynb', 'name': None},
|
||||
'name': None,
|
||||
'kernel': {
|
||||
'id': 'A',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}, {
|
||||
'id':sessions[1]['id'],
|
||||
'path': u'/path/to/2/test2.py',
|
||||
'type': 'file',
|
||||
'name': None,
|
||||
'kernel': {
|
||||
'id': 'B',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}, {
|
||||
'id':sessions[2]['id'],
|
||||
'path': u'/path/to/3',
|
||||
'type': 'console',
|
||||
'name': 'foo',
|
||||
'kernel': {
|
||||
'id': 'C',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}
|
||||
]
|
||||
self.assertEqual(sessions, expected)
|
||||
|
||||
def test_list_sessions_dead_kernel(self):
|
||||
sm = self.sm
|
||||
sessions = self.create_sessions(
|
||||
dict(path='/path/to/1/test1.ipynb', kernel_name='python'),
|
||||
dict(path='/path/to/2/test2.ipynb', kernel_name='python'),
|
||||
)
|
||||
# kill one of the kernels
|
||||
sm.kernel_manager.shutdown_kernel(sessions[0]['kernel']['id'])
|
||||
listed = self.loop.run_sync(lambda: sm.list_sessions())
|
||||
expected = [
|
||||
{
|
||||
'id': sessions[1]['id'],
|
||||
'path': u'/path/to/2/test2.ipynb',
|
||||
'type': 'notebook',
|
||||
'name': None,
|
||||
'notebook': {'path': u'/path/to/2/test2.ipynb', 'name': None},
|
||||
'kernel': {
|
||||
'id': 'B',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}
|
||||
]
|
||||
self.assertEqual(listed, expected)
|
||||
|
||||
def test_update_session(self):
|
||||
sm = self.sm
|
||||
session_id = self.create_session(path='/path/to/test.ipynb',
|
||||
kernel_name='julia')['id']
|
||||
self.loop.run_sync(lambda: sm.update_session(session_id, path='/path/to/new_name.ipynb'))
|
||||
model = self.loop.run_sync(lambda: sm.get_session(session_id=session_id))
|
||||
expected = {'id':session_id,
|
||||
'path': u'/path/to/new_name.ipynb',
|
||||
'type': 'notebook',
|
||||
'name': None,
|
||||
'notebook': {'path': u'/path/to/new_name.ipynb', 'name': None},
|
||||
'kernel': {
|
||||
'id': 'A',
|
||||
'name':'julia',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}
|
||||
self.assertEqual(model, expected)
|
||||
|
||||
def test_bad_update_session(self):
|
||||
# try to update a session with a bad keyword ~ raise error
|
||||
sm = self.sm
|
||||
session_id = self.create_session(path='/path/to/test.ipynb',
|
||||
kernel_name='ir')['id']
|
||||
with self.assertRaises(TypeError):
|
||||
self.loop.run_sync(lambda: sm.update_session(session_id=session_id, bad_kw='test.ipynb')) # Bad keyword
|
||||
|
||||
def test_delete_session(self):
|
||||
sm = self.sm
|
||||
sessions = self.create_sessions(
|
||||
dict(path='/path/to/1/test1.ipynb', kernel_name='python'),
|
||||
dict(path='/path/to/2/test2.ipynb', kernel_name='python'),
|
||||
dict(path='/path/to/3', name='foo', type='console', kernel_name='python'),
|
||||
)
|
||||
self.loop.run_sync(lambda: sm.delete_session(sessions[1]['id']))
|
||||
new_sessions = self.loop.run_sync(lambda: sm.list_sessions())
|
||||
expected = [{
|
||||
'id': sessions[0]['id'],
|
||||
'path': u'/path/to/1/test1.ipynb',
|
||||
'type': 'notebook',
|
||||
'name': None,
|
||||
'notebook': {'path': u'/path/to/1/test1.ipynb', 'name': None},
|
||||
'kernel': {
|
||||
'id': 'A',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}, {
|
||||
'id': sessions[2]['id'],
|
||||
'type': 'console',
|
||||
'path': u'/path/to/3',
|
||||
'name': 'foo',
|
||||
'kernel': {
|
||||
'id': 'C',
|
||||
'name':'python',
|
||||
'connections': 0,
|
||||
'last_activity': dummy_date_s,
|
||||
'execution_state': 'idle',
|
||||
}
|
||||
}
|
||||
]
|
||||
self.assertEqual(new_sessions, expected)
|
||||
|
||||
def test_bad_delete_session(self):
|
||||
# try to delete a session that doesn't exist ~ raise error
|
||||
sm = self.sm
|
||||
self.create_session(path='/path/to/test.ipynb', kernel_name='python')
|
||||
with self.assertRaises(TypeError):
|
||||
self.loop.run_sync(lambda : sm.delete_session(bad_kwarg='23424')) # Bad keyword
|
||||
with self.assertRaises(web.HTTPError):
|
||||
self.loop.run_sync(lambda : sm.delete_session(session_id='23424')) # nonexistent
|
||||
|
||||
|
|
@ -0,0 +1,290 @@
|
|||
"""Test the sessions web service API."""
|
||||
|
||||
import errno
|
||||
from functools import partial
|
||||
import io
|
||||
import os
|
||||
import json
|
||||
import shutil
|
||||
import sys
|
||||
import time
|
||||
|
||||
from unittest import SkipTest
|
||||
|
||||
from notebook.utils import url_path_join
|
||||
from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
|
||||
from nbformat.v4 import new_notebook
|
||||
from nbformat import write
|
||||
|
||||
try:
|
||||
from jupyter_client import AsyncMultiKernelManager
|
||||
async_testing_enabled = True
|
||||
except ImportError:
|
||||
async_testing_enabled = False
|
||||
|
||||
pjoin = os.path.join
|
||||
|
||||
|
||||
class SessionAPI(object):
|
||||
"""Wrapper for notebook API calls."""
|
||||
def __init__(self, request):
|
||||
self.request = request
|
||||
|
||||
def _req(self, verb, path, body=None):
|
||||
response = self.request(verb,
|
||||
url_path_join('api/sessions', path), data=body)
|
||||
|
||||
if 400 <= response.status_code < 600:
|
||||
try:
|
||||
response.reason = response.json()['message']
|
||||
except:
|
||||
pass
|
||||
response.raise_for_status()
|
||||
|
||||
return response
|
||||
|
||||
def list(self):
|
||||
return self._req('GET', '')
|
||||
|
||||
def get(self, id):
|
||||
return self._req('GET', id)
|
||||
|
||||
def create(self, path, type='notebook', kernel_name='python', kernel_id=None):
|
||||
body = json.dumps({'path': path,
|
||||
'type': type,
|
||||
'kernel': {'name': kernel_name,
|
||||
'id': kernel_id}})
|
||||
return self._req('POST', '', body)
|
||||
|
||||
def create_deprecated(self, path):
|
||||
body = json.dumps({'notebook': {'path': path},
|
||||
'kernel': {'name': 'python',
|
||||
'id': 'foo'}})
|
||||
return self._req('POST', '', body)
|
||||
|
||||
def modify_path(self, id, path):
|
||||
body = json.dumps({'path': path})
|
||||
return self._req('PATCH', id, body)
|
||||
|
||||
def modify_path_deprecated(self, id, path):
|
||||
body = json.dumps({'notebook': {'path': path}})
|
||||
return self._req('PATCH', id, body)
|
||||
|
||||
def modify_type(self, id, type):
|
||||
body = json.dumps({'type': type})
|
||||
return self._req('PATCH', id, body)
|
||||
|
||||
def modify_kernel_name(self, id, kernel_name):
|
||||
body = json.dumps({'kernel': {'name': kernel_name}})
|
||||
return self._req('PATCH', id, body)
|
||||
|
||||
def modify_kernel_id(self, id, kernel_id):
|
||||
# Also send a dummy name to show that id takes precedence.
|
||||
body = json.dumps({'kernel': {'id': kernel_id, 'name': 'foo'}})
|
||||
return self._req('PATCH', id, body)
|
||||
|
||||
def delete(self, id):
|
||||
return self._req('DELETE', id)
|
||||
|
||||
|
||||
class SessionAPITest(NotebookTestBase):
|
||||
"""Test the sessions web service API"""
|
||||
def setUp(self):
|
||||
nbdir = self.notebook_dir
|
||||
subdir = pjoin(nbdir, 'foo')
|
||||
|
||||
try:
|
||||
os.mkdir(subdir)
|
||||
except OSError as e:
|
||||
# Deleting the folder in an earlier test may have failed
|
||||
if e.errno != errno.EEXIST:
|
||||
raise
|
||||
self.addCleanup(partial(shutil.rmtree, subdir, ignore_errors=True))
|
||||
|
||||
with io.open(pjoin(subdir, 'nb1.ipynb'), 'w', encoding='utf-8') as f:
|
||||
nb = new_notebook()
|
||||
write(nb, f, version=4)
|
||||
|
||||
self.sess_api = SessionAPI(self.request)
|
||||
|
||||
@self.addCleanup
|
||||
def cleanup_sessions():
|
||||
for session in self.sess_api.list().json():
|
||||
self.sess_api.delete(session['id'])
|
||||
|
||||
# This is necessary in some situations on Windows: without it, it
|
||||
# fails to delete the directory because something is still using
|
||||
# it. I think there is a brief period after the kernel terminates
|
||||
# where Windows still treats its working directory as in use. On my
|
||||
# Windows VM, 0.01s is not long enough, but 0.1s appears to work
|
||||
# reliably. -- TK, 15 December 2014
|
||||
time.sleep(0.1)
|
||||
|
||||
def test_create(self):
|
||||
sessions = self.sess_api.list().json()
|
||||
self.assertEqual(len(sessions), 0)
|
||||
|
||||
resp = self.sess_api.create('foo/nb1.ipynb')
|
||||
self.assertEqual(resp.status_code, 201)
|
||||
newsession = resp.json()
|
||||
self.assertIn('id', newsession)
|
||||
self.assertEqual(newsession['path'], 'foo/nb1.ipynb')
|
||||
self.assertEqual(newsession['type'], 'notebook')
|
||||
self.assertEqual(resp.headers['Location'], self.url_prefix + 'api/sessions/{0}'.format(newsession['id']))
|
||||
|
||||
sessions = self.sess_api.list().json()
|
||||
self.assertEqual(sessions, [newsession])
|
||||
|
||||
# Retrieve it
|
||||
sid = newsession['id']
|
||||
got = self.sess_api.get(sid).json()
|
||||
self.assertEqual(got, newsession)
|
||||
|
||||
def test_create_file_session(self):
|
||||
resp = self.sess_api.create('foo/nb1.py', type='file')
|
||||
self.assertEqual(resp.status_code, 201)
|
||||
newsession = resp.json()
|
||||
self.assertEqual(newsession['path'], 'foo/nb1.py')
|
||||
self.assertEqual(newsession['type'], 'file')
|
||||
|
||||
def test_create_console_session(self):
|
||||
resp = self.sess_api.create('foo/abc123', type='console')
|
||||
self.assertEqual(resp.status_code, 201)
|
||||
newsession = resp.json()
|
||||
self.assertEqual(newsession['path'], 'foo/abc123')
|
||||
self.assertEqual(newsession['type'], 'console')
|
||||
|
||||
def test_create_deprecated(self):
|
||||
resp = self.sess_api.create_deprecated('foo/nb1.ipynb')
|
||||
self.assertEqual(resp.status_code, 201)
|
||||
newsession = resp.json()
|
||||
self.assertEqual(newsession['path'], 'foo/nb1.ipynb')
|
||||
self.assertEqual(newsession['type'], 'notebook')
|
||||
self.assertEqual(newsession['notebook']['path'], 'foo/nb1.ipynb')
|
||||
|
||||
def test_create_with_kernel_id(self):
|
||||
# create a new kernel
|
||||
r = self.request('POST', 'api/kernels')
|
||||
r.raise_for_status()
|
||||
kernel = r.json()
|
||||
|
||||
resp = self.sess_api.create('foo/nb1.ipynb', kernel_id=kernel['id'])
|
||||
self.assertEqual(resp.status_code, 201)
|
||||
newsession = resp.json()
|
||||
self.assertIn('id', newsession)
|
||||
self.assertEqual(newsession['path'], 'foo/nb1.ipynb')
|
||||
self.assertEqual(newsession['kernel']['id'], kernel['id'])
|
||||
self.assertEqual(resp.headers['Location'], self.url_prefix + 'api/sessions/{0}'.format(newsession['id']))
|
||||
|
||||
sessions = self.sess_api.list().json()
|
||||
self.assertEqual(sessions, [newsession])
|
||||
|
||||
# Retrieve it
|
||||
sid = newsession['id']
|
||||
got = self.sess_api.get(sid).json()
|
||||
self.assertEqual(got, newsession)
|
||||
|
||||
def test_delete(self):
|
||||
newsession = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = newsession['id']
|
||||
|
||||
resp = self.sess_api.delete(sid)
|
||||
self.assertEqual(resp.status_code, 204)
|
||||
|
||||
sessions = self.sess_api.list().json()
|
||||
self.assertEqual(sessions, [])
|
||||
|
||||
with assert_http_error(404):
|
||||
self.sess_api.get(sid)
|
||||
|
||||
def test_modify_path(self):
|
||||
newsession = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = newsession['id']
|
||||
|
||||
changed = self.sess_api.modify_path(sid, 'nb2.ipynb').json()
|
||||
self.assertEqual(changed['id'], sid)
|
||||
self.assertEqual(changed['path'], 'nb2.ipynb')
|
||||
|
||||
def test_modify_path_deprecated(self):
|
||||
newsession = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = newsession['id']
|
||||
|
||||
changed = self.sess_api.modify_path_deprecated(sid, 'nb2.ipynb').json()
|
||||
self.assertEqual(changed['id'], sid)
|
||||
self.assertEqual(changed['notebook']['path'], 'nb2.ipynb')
|
||||
|
||||
def test_modify_type(self):
|
||||
newsession = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = newsession['id']
|
||||
|
||||
changed = self.sess_api.modify_type(sid, 'console').json()
|
||||
self.assertEqual(changed['id'], sid)
|
||||
self.assertEqual(changed['type'], 'console')
|
||||
|
||||
def test_modify_kernel_name(self):
|
||||
before = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = before['id']
|
||||
|
||||
after = self.sess_api.modify_kernel_name(sid, before['kernel']['name']).json()
|
||||
self.assertEqual(after['id'], sid)
|
||||
self.assertEqual(after['path'], before['path'])
|
||||
self.assertEqual(after['type'], before['type'])
|
||||
self.assertNotEqual(after['kernel']['id'], before['kernel']['id'])
|
||||
|
||||
# check kernel list, to be sure previous kernel was cleaned up
|
||||
r = self.request('GET', 'api/kernels')
|
||||
r.raise_for_status()
|
||||
kernel_list = r.json()
|
||||
after['kernel'].pop('last_activity')
|
||||
[ k.pop('last_activity') for k in kernel_list ]
|
||||
self.assertEqual(kernel_list, [after['kernel']])
|
||||
|
||||
def test_modify_kernel_id(self):
|
||||
before = self.sess_api.create('foo/nb1.ipynb').json()
|
||||
sid = before['id']
|
||||
|
||||
# create a new kernel
|
||||
r = self.request('POST', 'api/kernels')
|
||||
r.raise_for_status()
|
||||
kernel = r.json()
|
||||
|
||||
# Attach our session to the existing kernel
|
||||
after = self.sess_api.modify_kernel_id(sid, kernel['id']).json()
|
||||
self.assertEqual(after['id'], sid)
|
||||
self.assertEqual(after['path'], before['path'])
|
||||
self.assertEqual(after['type'], before['type'])
|
||||
self.assertNotEqual(after['kernel']['id'], before['kernel']['id'])
|
||||
self.assertEqual(after['kernel']['id'], kernel['id'])
|
||||
|
||||
# check kernel list, to be sure previous kernel was cleaned up
|
||||
r = self.request('GET', 'api/kernels')
|
||||
r.raise_for_status()
|
||||
kernel_list = r.json()
|
||||
|
||||
kernel.pop('last_activity')
|
||||
[ k.pop('last_activity') for k in kernel_list ]
|
||||
self.assertEqual(kernel_list, [kernel])
|
||||
|
||||
|
||||
class AsyncSessionAPITest(SessionAPITest):
|
||||
"""Test the sessions web service API using the AsyncMappingKernelManager"""
|
||||
|
||||
@classmethod
|
||||
def setup_class(cls):
|
||||
if not async_testing_enabled: # Can be removed once jupyter_client >= 6.1 is required.
|
||||
raise SkipTest("AsyncSessionAPITest tests skipped due to down-level jupyter_client!")
|
||||
if sys.version_info < (3, 6): # Can be removed once 3.5 is dropped.
|
||||
raise SkipTest("AsyncSessionAPITest tests skipped due to Python < 3.6!")
|
||||
super(AsyncSessionAPITest, cls).setup_class()
|
||||
|
||||
@classmethod
|
||||
def get_argv(cls):
|
||||
argv = super(AsyncSessionAPITest, cls).get_argv()
|
||||
|
||||
# Before we extend the argv with the class, ensure that appropriate jupyter_client is available.
|
||||
# if not available, don't set kernel_manager_class, resulting in the repeat of sync-based tests.
|
||||
if async_testing_enabled:
|
||||
argv.extend(['--NotebookApp.kernel_manager_class='
|
||||
'notebook.services.kernels.kernelmanager.AsyncMappingKernelManager'])
|
||||
|
||||
return argv
|
||||
Loading…
Add table
Add a link
Reference in a new issue