##// END OF EJS Templates
Merge pull request #6335 from jasongrout/patch-7...
Merge pull request #6335 from jasongrout/patch-7 Add env to the kernelspec __init__

File last commit:

r17537:96cae319
r17694:100dd64b merge
Show More
test_contents_api.py
485 lines | 18.5 KiB | text/x-python | PythonLexer
MinRK
unicode normalization in test_notebooks_api
r13091 # coding: utf-8
MinRK
rename notebooks service to contents service...
r17524 """Test the contents webservice API."""
Zachary Sailer
Added notebooks API tests.
r13041
MinRK
teach contents service about non-notebook files
r17525 import base64
Thomas Kluyver
Improve tests for notebook REST API
r13083 import io
MinRK
copy_from in json, not in url param
r13137 import json
Zachary Sailer
Added notebooks API tests.
r13041 import os
Thomas Kluyver
Improve tests for notebook REST API
r13083 import shutil
MinRK
unicode normalization in test_notebooks_api
r13091 from unicodedata import normalize
Thomas Kluyver
Improve tests for notebook REST API
r13083 pjoin = os.path.join
Zachary Sailer
Added notebooks API tests.
r13041 import requests
MinRK
escape URLs in Location headers
r13132 from IPython.html.utils import url_path_join, url_escape
Thomas Kluyver
Add failing test for listing nonexistant directory
r13099 from IPython.html.tests.launchnotebook import NotebookTestBase, assert_http_error
MinRK
test upload of v2 notebooks
r13141 from IPython.nbformat import current
Thomas Kluyver
Add test for saving notebook via REST API
r13085 from IPython.nbformat.current import (new_notebook, write, read, new_worksheet,
new_heading_cell, to_notebook_json)
MinRK
test upload of v2 notebooks
r13141 from IPython.nbformat import v2
MinRK
update notebook api tests...
r13130 from IPython.utils import py3compat
Thomas Kluyver
Improve tests for notebook REST API
r13083 from IPython.utils.data import uniq_stable
MinRK
update notebook api tests...
r13130
MinRK
teach contents service about non-notebook files
r17525 def notebooks_only(dir_model):
return [nb for nb in dir_model['content'] if nb['type']=='notebook']
Brian E. Granger
Get the existing tests working.
r15079
MinRK
teach contents service about non-notebook files
r17525 def dirs_only(dir_model):
return [x for x in dir_model['content'] if x['type']=='directory']
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522
Brian E. Granger
Get the existing tests working.
r15079
MinRK
rename notebooks service to contents service...
r17524 class API(object):
"""Wrapper for contents API calls."""
Thomas Kluyver
Improve tests for notebook REST API
r13083 def __init__(self, base_url):
self.base_url = base_url
MinRK
copy_from in json, not in url param
r13137 def _req(self, verb, path, body=None):
Thomas Kluyver
Improve tests for notebook REST API
r13083 response = requests.request(verb,
MinRK
rename notebooks service to contents service...
r17524 url_path_join(self.base_url, 'api/contents', path),
MinRK
update notebook api tests...
r13130 data=body,
)
Thomas Kluyver
Improve tests for notebook REST API
r13083 response.raise_for_status()
return response
def list(self, path='/'):
return self._req('GET', path)
def read(self, name, path='/'):
return self._req('GET', url_path_join(path, name))
MinRK
add support and tests for uploading and saving regular files
r17527 def create_untitled(self, path='/', ext=None):
body = None
if ext:
body = json.dumps({'ext': ext})
return self._req('POST', path, body)
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
update notebook api tests...
r13130 def upload_untitled(self, body, path='/'):
return self._req('POST', path, body)
def copy_untitled(self, copy_from, path='/'):
MinRK
copy_from in json, not in url param
r13137 body = json.dumps({'copy_from':copy_from})
return self._req('POST', path, body)
MinRK
update notebook api tests...
r13130
def create(self, name, path='/'):
return self._req('PUT', url_path_join(path, name))
Thomas Kluyver
Add test for REST API uploading notebook
r13084 def upload(self, name, body, path='/'):
MinRK
update notebook api tests...
r13130 return self._req('PUT', url_path_join(path, name), body)
Thomas Kluyver
Add test for REST API uploading notebook
r13084
MinRK
support deleting empty directories...
r17530 def mkdir(self, name, path='/'):
return self._req('PUT', url_path_join(path, name), json.dumps({'type': 'directory'}))
MinRK
update notebook api tests...
r13130 def copy(self, copy_from, copy_to, path='/'):
MinRK
copy_from in json, not in url param
r13137 body = json.dumps({'copy_from':copy_from})
return self._req('PUT', url_path_join(path, copy_to), body)
Thomas Kluyver
Add test for copying notebook through REST API
r13086
Thomas Kluyver
Add test for saving notebook via REST API
r13085 def save(self, name, body, path='/'):
return self._req('PUT', url_path_join(path, name), body)
Thomas Kluyver
Improve tests for notebook REST API
r13083 def delete(self, name, path='/'):
return self._req('DELETE', url_path_join(path, name))
def rename(self, name, path, new_name):
MinRK
don't use jsonapi in test_notebook_api
r13138 body = json.dumps({'name': new_name})
Thomas Kluyver
Improve tests for notebook REST API
r13083 return self._req('PATCH', url_path_join(path, name), body)
Zachary Sailer
Added notebooks API tests.
r13041
Thomas Kluyver
Test notebook checkpoint APIs
r13109 def get_checkpoints(self, name, path):
return self._req('GET', url_path_join(path, name, 'checkpoints'))
def new_checkpoint(self, name, path):
return self._req('POST', url_path_join(path, name, 'checkpoints'))
def restore_checkpoint(self, name, path, checkpoint_id):
return self._req('POST', url_path_join(path, name, 'checkpoints', checkpoint_id))
def delete_checkpoint(self, name, path, checkpoint_id):
return self._req('DELETE', url_path_join(path, name, 'checkpoints', checkpoint_id))
Zachary Sailer
Added notebooks API tests.
r13041 class APITest(NotebookTestBase):
"""Test the kernels web service API"""
Thomas Kluyver
Improve tests for notebook REST API
r13083 dirs_nbs = [('', 'inroot'),
('Directory with spaces in', 'inspace'),
(u'unicodé', 'innonascii'),
('foo', 'a'),
('foo', 'b'),
('foo', 'name with spaces'),
('foo', u'unicodé'),
('foo/bar', 'baz'),
Thomas Kluyver
Case insensitive sorting in the dashboard....
r15523 ('ordering', 'A'),
('ordering', 'b'),
('ordering', 'C'),
(u'å b', u'ç d'),
Thomas Kluyver
Improve tests for notebook REST API
r13083 ]
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522 hidden_dirs = ['.hidden', '__pycache__']
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
normalize unicode in notebook API tests...
r15623 dirs = uniq_stable([py3compat.cast_unicode(d) for (d,n) in dirs_nbs])
Thomas Kluyver
Improve tests for notebook REST API
r13083 del dirs[0] # remove ''
MinRK
normalize unicode in notebook API tests...
r15623 top_level_dirs = {normalize('NFC', d.split('/')[0]) for d in dirs}
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
teach contents service about non-notebook files
r17525 @staticmethod
def _blob_for_name(name):
return name.encode('utf-8') + b'\xFF'
@staticmethod
def _txt_for_name(name):
return u'%s text file' % name
Thomas Kluyver
Improve tests for notebook REST API
r13083 def setUp(self):
nbdir = self.notebook_dir.name
MinRK
teach contents service about non-notebook files
r17525 self.blob = os.urandom(100)
self.b64_blob = base64.encodestring(self.blob).decode('ascii')
Thomas Kluyver
Add test for REST API uploading notebook
r13084
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522 for d in (self.dirs + self.hidden_dirs):
MinRK
s/os.path.sep/os.sep/
r13182 d.replace('/', os.sep)
MinRK
update notebook api tests...
r13130 if not os.path.isdir(pjoin(nbdir, d)):
os.mkdir(pjoin(nbdir, d))
Thomas Kluyver
Improve tests for notebook REST API
r13083
for d, name in self.dirs_nbs:
MinRK
s/os.path.sep/os.sep/
r13182 d = d.replace('/', os.sep)
MinRK
teach contents service about non-notebook files
r17525 # create a notebook
Thomas Kluyver
Specify encoding in remainining instances of io.open
r13657 with io.open(pjoin(nbdir, d, '%s.ipynb' % name), 'w',
encoding='utf-8') as f:
Thomas Kluyver
Improve tests for notebook REST API
r13083 nb = new_notebook(name=name)
write(nb, f, format='ipynb')
MinRK
teach contents service about non-notebook files
r17525 # create a text file
with io.open(pjoin(nbdir, d, '%s.txt' % name), 'w',
encoding='utf-8') as f:
f.write(self._txt_for_name(name))
# create a binary file
with io.open(pjoin(nbdir, d, '%s.blob' % name), 'wb') as f:
f.write(self._blob_for_name(name))
MinRK
rename notebooks service to contents service...
r17524 self.api = API(self.base_url())
Thomas Kluyver
Improve tests for notebook REST API
r13083
def tearDown(self):
nbdir = self.notebook_dir.name
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522 for dname in (list(self.top_level_dirs) + self.hidden_dirs):
Thomas Kluyver
Improve tests for notebook REST API
r13083 shutil.rmtree(pjoin(nbdir, dname), ignore_errors=True)
if os.path.isfile(pjoin(nbdir, 'inroot.ipynb')):
os.unlink(pjoin(nbdir, 'inroot.ipynb'))
def test_list_notebooks(self):
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list().json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 1)
self.assertEqual(nbs[0]['name'], 'inroot.ipynb')
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list('/Directory with spaces in/').json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 1)
self.assertEqual(nbs[0]['name'], 'inspace.ipynb')
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list(u'/unicodé/').json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 1)
self.assertEqual(nbs[0]['name'], 'innonascii.ipynb')
MinRK
update notebook api tests...
r13130 self.assertEqual(nbs[0]['path'], u'unicodé')
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list('/foo/bar/').json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 1)
self.assertEqual(nbs[0]['name'], 'baz.ipynb')
MinRK
update notebook api tests...
r13130 self.assertEqual(nbs[0]['path'], 'foo/bar')
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list('foo').json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 4)
MinRK
unicode normalization in test_notebooks_api
r13091 nbnames = { normalize('NFC', n['name']) for n in nbs }
expected = [ u'a.ipynb', u'b.ipynb', u'name with spaces.ipynb', u'unicodé.ipynb']
expected = { normalize('NFC', name) for name in expected }
self.assertEqual(nbnames, expected)
MinRK
mv services/notebooks services/contents
r17523
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list('ordering').json())
Thomas Kluyver
Case insensitive sorting in the dashboard....
r15523 nbnames = [n['name'] for n in nbs]
expected = ['A.ipynb', 'b.ipynb', 'C.ipynb']
self.assertEqual(nbnames, expected)
Thomas Kluyver
Improve tests for notebook REST API
r13083
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522 def test_list_dirs(self):
MinRK
rename notebooks service to contents service...
r17524 dirs = dirs_only(self.api.list().json())
MinRK
normalize unicode in notebook API tests...
r15623 dir_names = {normalize('NFC', d['name']) for d in dirs}
Thomas Kluyver
Hide directories beginning with _ from the dashboard....
r15522 self.assertEqual(dir_names, self.top_level_dirs) # Excluding hidden dirs
Thomas Kluyver
Add failing test for listing nonexistant directory
r13099 def test_list_nonexistant_dir(self):
with assert_http_error(404):
MinRK
rename notebooks service to contents service...
r17524 self.api.list('nonexistant')
Thomas Kluyver
Add test for and fix REST save with rename
r13087
MinRK
teach contents service about non-notebook files
r17525 def test_get_nb_contents(self):
Thomas Kluyver
Improve tests for notebook REST API
r13083 for d, name in self.dirs_nbs:
MinRK
rename notebooks service to contents service...
r17524 nb = self.api.read('%s.ipynb' % name, d+'/').json()
MinRK
update notebook api tests...
r13130 self.assertEqual(nb['name'], u'%s.ipynb' % name)
MinRK
teach contents service about non-notebook files
r17525 self.assertEqual(nb['type'], 'notebook')
self.assertIn('content', nb)
self.assertEqual(nb['format'], 'json')
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertIn('content', nb)
self.assertIn('metadata', nb['content'])
self.assertIsInstance(nb['content']['metadata'], dict)
MinRK
teach contents service about non-notebook files
r17525 def test_get_contents_no_such_file(self):
Thomas Kluyver
Improve tests for notebook REST API
r13083 # Name that doesn't exist - should be a 404
Thomas Kluyver
Add failing test for listing nonexistant directory
r13099 with assert_http_error(404):
MinRK
rename notebooks service to contents service...
r17524 self.api.read('q.ipynb', 'foo')
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
teach contents service about non-notebook files
r17525 def test_get_text_file_contents(self):
for d, name in self.dirs_nbs:
model = self.api.read(u'%s.txt' % name, d+'/').json()
self.assertEqual(model['name'], u'%s.txt' % name)
self.assertIn('content', model)
self.assertEqual(model['format'], 'text')
self.assertEqual(model['type'], 'file')
self.assertEqual(model['content'], self._txt_for_name(name))
# Name that doesn't exist - should be a 404
with assert_http_error(404):
self.api.read('q.txt', 'foo')
def test_get_binary_file_contents(self):
for d, name in self.dirs_nbs:
model = self.api.read(u'%s.blob' % name, d+'/').json()
self.assertEqual(model['name'], u'%s.blob' % name)
self.assertIn('content', model)
self.assertEqual(model['format'], 'base64')
self.assertEqual(model['type'], 'file')
b64_data = base64.encodestring(self._blob_for_name(name)).decode('ascii')
self.assertEqual(model['content'], b64_data)
# Name that doesn't exist - should be a 404
with assert_http_error(404):
self.api.read('q.txt', 'foo')
MinRK
test creating a directory with PUT
r17528 def _check_created(self, resp, name, path, type='notebook'):
Thomas Kluyver
Add test for REST API uploading notebook
r13084 self.assertEqual(resp.status_code, 201)
MinRK
update notebook api tests...
r13130 location_header = py3compat.str_to_unicode(resp.headers['Location'])
MinRK
rename notebooks service to contents service...
r17524 self.assertEqual(location_header, url_escape(url_path_join(u'/api/contents', path, name)))
MinRK
test creating a directory with PUT
r17528 rjson = resp.json()
self.assertEqual(rjson['name'], name)
self.assertEqual(rjson['path'], path)
self.assertEqual(rjson['type'], type)
isright = os.path.isdir if type == 'directory' else os.path.isfile
assert isright(pjoin(
MinRK
Windows testing fixes
r13178 self.notebook_dir.name,
MinRK
s/os.path.sep/os.sep/
r13182 path.replace('/', os.sep),
MinRK
Windows testing fixes
r13178 name,
))
Thomas Kluyver
Improve tests for notebook REST API
r13083
def test_create_untitled(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.create_untitled(path=u'Ã¥ b')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, 'Untitled0.ipynb', u'Ã¥ b')
Thomas Kluyver
Improve tests for notebook REST API
r13083
# Second time
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.create_untitled(path=u'Ã¥ b')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, 'Untitled1.ipynb', u'Ã¥ b')
Thomas Kluyver
Improve tests for notebook REST API
r13083
# And two directories down
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.create_untitled(path='foo/bar')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, 'Untitled0.ipynb', 'foo/bar')
Thomas Kluyver
Improve tests for notebook REST API
r13083
MinRK
add support and tests for uploading and saving regular files
r17527 def test_create_untitled_txt(self):
resp = self.api.create_untitled(path='foo/bar', ext='.txt')
MinRK
updates per review...
r17535 self._check_created(resp, 'untitled0.txt', 'foo/bar', type='file')
MinRK
add support and tests for uploading and saving regular files
r17527
MinRK
updates per review...
r17535 resp = self.api.read(path='foo/bar', name='untitled0.txt')
MinRK
add support and tests for uploading and saving regular files
r17527 model = resp.json()
self.assertEqual(model['type'], 'file')
self.assertEqual(model['format'], 'text')
self.assertEqual(model['content'], '')
MinRK
update notebook api tests...
r13130 def test_upload_untitled(self):
Thomas Kluyver
Add test for REST API uploading notebook
r13084 nb = new_notebook(name='Upload test')
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel = {'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.upload_untitled(path=u'Ã¥ b',
MinRK
don't use jsonapi in test_notebook_api
r13138 body=json.dumps(nbmodel))
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, 'Untitled0.ipynb', u'Ã¥ b')
MinRK
update notebook api tests...
r13130
def test_upload(self):
nb = new_notebook(name=u'ignored')
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel = {'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.upload(u'Upload tést.ipynb', path=u'å b',
MinRK
don't use jsonapi in test_notebook_api
r13138 body=json.dumps(nbmodel))
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, u'Upload tést.ipynb', u'å b')
def test_mkdir(self):
MinRK
support deleting empty directories...
r17530 resp = self.api.mkdir(u'New ∂ir', path=u'å b')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, u'New ∂ir', u'å b', type='directory')
MinRK
update notebook api tests...
r13130
MinRK
update contents per further review...
r17537 def test_mkdir_hidden_400(self):
with assert_http_error(400):
resp = self.api.mkdir(u'.hidden', path=u'Ã¥ b')
MinRK
add support and tests for uploading and saving regular files
r17527 def test_upload_txt(self):
body = u'ünicode téxt'
model = {
'content' : body,
'format' : 'text',
'type' : 'file',
}
resp = self.api.upload(u'Upload tést.txt', path=u'å b',
body=json.dumps(model))
# check roundtrip
resp = self.api.read(path=u'å b', name=u'Upload tést.txt')
model = resp.json()
self.assertEqual(model['type'], 'file')
self.assertEqual(model['format'], 'text')
self.assertEqual(model['content'], body)
def test_upload_b64(self):
body = b'\xFFblob'
b64body = base64.encodestring(body).decode('ascii')
model = {
'content' : b64body,
'format' : 'base64',
'type' : 'file',
}
resp = self.api.upload(u'Upload tést.blob', path=u'å b',
body=json.dumps(model))
# check roundtrip
resp = self.api.read(path=u'å b', name=u'Upload tést.blob')
model = resp.json()
self.assertEqual(model['type'], 'file')
self.assertEqual(model['format'], 'base64')
decoded = base64.decodestring(model['content'].encode('ascii'))
self.assertEqual(decoded, body)
MinRK
test upload of v2 notebooks
r13141 def test_upload_v2(self):
nb = v2.new_notebook()
ws = v2.new_worksheet()
nb.worksheets.append(ws)
ws.cells.append(v2.new_code_cell(input='print("hi")'))
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel = {'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.upload(u'Upload tést.ipynb', path=u'å b',
MinRK
test upload of v2 notebooks
r13141 body=json.dumps(nbmodel))
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, u'Upload tést.ipynb', u'å b')
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.read(u'Upload tést.ipynb', u'å b')
MinRK
test upload of v2 notebooks
r13141 data = resp.json()
self.assertEqual(data['content']['nbformat'], current.nbformat)
self.assertEqual(data['content']['orig_nbformat'], 2)
MinRK
update notebook api tests...
r13130 def test_copy_untitled(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.copy_untitled(u'ç d.ipynb', path=u'å b')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, u'ç d-Copy0.ipynb', u'å b')
Thomas Kluyver
Add test for REST API uploading notebook
r13084
Thomas Kluyver
Add test for copying notebook through REST API
r13086 def test_copy(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.copy(u'ç d.ipynb', u'cøpy.ipynb', path=u'å b')
MinRK
test creating a directory with PUT
r17528 self._check_created(resp, u'cøpy.ipynb', u'å b')
Thomas Kluyver
Add test for copying notebook through REST API
r13086
MinRK
updates per review...
r17535 def test_copy_path(self):
resp = self.api.copy(u'foo/a.ipynb', u'cøpyfoo.ipynb', path=u'å b')
self._check_created(resp, u'cøpyfoo.ipynb', u'å b')
MinRK
support deleting empty directories...
r17530 def test_copy_dir_400(self):
# can't copy directories
with assert_http_error(400):
resp = self.api.copy(u'Ã¥ b', u'Ã¥ c')
Thomas Kluyver
Improve tests for notebook REST API
r13083 def test_delete(self):
for d, name in self.dirs_nbs:
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.delete('%s.ipynb' % name, d)
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(resp.status_code, 204)
for d in self.dirs + ['/']:
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list(d).json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(len(nbs), 0)
MinRK
support deleting empty directories...
r17530 def test_delete_dirs(self):
# depth-first delete everything, so we don't try to delete empty directories
for name in sorted(self.dirs + ['/'], key=len, reverse=True):
listing = self.api.list(name).json()['content']
for model in listing:
self.api.delete(model['name'], model['path'])
listing = self.api.list('/').json()['content']
self.assertEqual(listing, [])
def test_delete_non_empty_dir(self):
"""delete non-empty dir raises 400"""
with assert_http_error(400):
self.api.delete(u'Ã¥ b')
Thomas Kluyver
Improve tests for notebook REST API
r13083 def test_rename(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.rename('a.ipynb', 'foo', 'z.ipynb')
Thomas Kluyver
Check Location header from renaming notebook
r13089 self.assertEqual(resp.headers['Location'].split('/')[-1], 'z.ipynb')
Thomas Kluyver
Improve tests for notebook REST API
r13083 self.assertEqual(resp.json()['name'], 'z.ipynb')
assert os.path.isfile(pjoin(self.notebook_dir.name, 'foo', 'z.ipynb'))
MinRK
rename notebooks service to contents service...
r17524 nbs = notebooks_only(self.api.list('foo').json())
Thomas Kluyver
Improve tests for notebook REST API
r13083 nbnames = set(n['name'] for n in nbs)
self.assertIn('z.ipynb', nbnames)
self.assertNotIn('a.ipynb', nbnames)
Thomas Kluyver
Add test for saving notebook via REST API
r13085
MinRK
test that rename fails with 409 if it would clobber...
r13710 def test_rename_existing(self):
with assert_http_error(409):
MinRK
rename notebooks service to contents service...
r17524 self.api.rename('a.ipynb', 'foo', 'b.ipynb')
MinRK
test that rename fails with 409 if it would clobber...
r13710
Thomas Kluyver
Add test for saving notebook via REST API
r13085 def test_save(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.read('a.ipynb', 'foo')
MinRK
don't use jsonapi in test_notebook_api
r13138 nbcontent = json.loads(resp.text)['content']
Thomas Kluyver
Add test for saving notebook via REST API
r13085 nb = to_notebook_json(nbcontent)
ws = new_worksheet()
nb.worksheets = [ws]
Thomas Kluyver
Add some unicode testing for saving notebooks
r13111 ws.cells.append(new_heading_cell(u'Created by test ³'))
Thomas Kluyver
Add test for saving notebook via REST API
r13085
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel= {'name': 'a.ipynb', 'path':'foo', 'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.save('a.ipynb', path='foo', body=json.dumps(nbmodel))
Thomas Kluyver
Add test for saving notebook via REST API
r13085
nbfile = pjoin(self.notebook_dir.name, 'foo', 'a.ipynb')
Thomas Kluyver
Add some unicode testing for saving notebooks
r13111 with io.open(nbfile, 'r', encoding='utf-8') as f:
Thomas Kluyver
Add test for saving notebook via REST API
r13085 newnb = read(f, format='ipynb')
self.assertEqual(newnb.worksheets[0].cells[0].source,
Thomas Kluyver
Add some unicode testing for saving notebooks
r13111 u'Created by test ³')
MinRK
rename notebooks service to contents service...
r17524 nbcontent = self.api.read('a.ipynb', 'foo').json()['content']
Thomas Kluyver
Add some unicode testing for saving notebooks
r13111 newnb = to_notebook_json(nbcontent)
self.assertEqual(newnb.worksheets[0].cells[0].source,
u'Created by test ³')
Thomas Kluyver
Add test for and fix REST save with rename
r13087
# Save and rename
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel= {'name': 'a2.ipynb', 'path':'foo/bar', 'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.save('a.ipynb', path='foo', body=json.dumps(nbmodel))
Thomas Kluyver
Add test for and fix REST save with rename
r13087 saved = resp.json()
self.assertEqual(saved['name'], 'a2.ipynb')
self.assertEqual(saved['path'], 'foo/bar')
assert os.path.isfile(pjoin(self.notebook_dir.name,'foo','bar','a2.ipynb'))
assert not os.path.isfile(pjoin(self.notebook_dir.name, 'foo', 'a.ipynb'))
Thomas Kluyver
Add failing test for listing nonexistant directory
r13099 with assert_http_error(404):
MinRK
rename notebooks service to contents service...
r17524 self.api.read('a.ipynb', 'foo')
Thomas Kluyver
Test notebook checkpoint APIs
r13109
def test_checkpoints(self):
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.read('a.ipynb', 'foo')
r = self.api.new_checkpoint('a.ipynb', 'foo')
Thomas Kluyver
Test notebook checkpoint APIs
r13109 self.assertEqual(r.status_code, 201)
cp1 = r.json()
MinRK
use 'id' for checkpoint ID key...
r13122 self.assertEqual(set(cp1), {'id', 'last_modified'})
self.assertEqual(r.headers['Location'].split('/')[-1], cp1['id'])
Thomas Kluyver
Test notebook checkpoint APIs
r13109
# Modify it
MinRK
don't use jsonapi in test_notebook_api
r13138 nbcontent = json.loads(resp.text)['content']
Thomas Kluyver
Test notebook checkpoint APIs
r13109 nb = to_notebook_json(nbcontent)
ws = new_worksheet()
nb.worksheets = [ws]
hcell = new_heading_cell('Created by test')
ws.cells.append(hcell)
# Save
MinRK
add support and tests for uploading and saving regular files
r17527 nbmodel= {'name': 'a.ipynb', 'path':'foo', 'content': nb, 'type': 'notebook'}
MinRK
rename notebooks service to contents service...
r17524 resp = self.api.save('a.ipynb', path='foo', body=json.dumps(nbmodel))
Thomas Kluyver
Test notebook checkpoint APIs
r13109
# List checkpoints
MinRK
rename notebooks service to contents service...
r17524 cps = self.api.get_checkpoints('a.ipynb', 'foo').json()
Thomas Kluyver
Test notebook checkpoint APIs
r13109 self.assertEqual(cps, [cp1])
MinRK
rename notebooks service to contents service...
r17524 nbcontent = self.api.read('a.ipynb', 'foo').json()['content']
Thomas Kluyver
Test notebook checkpoint APIs
r13109 nb = to_notebook_json(nbcontent)
self.assertEqual(nb.worksheets[0].cells[0].source, 'Created by test')
# Restore cp1
MinRK
rename notebooks service to contents service...
r17524 r = self.api.restore_checkpoint('a.ipynb', 'foo', cp1['id'])
Thomas Kluyver
Test notebook checkpoint APIs
r13109 self.assertEqual(r.status_code, 204)
MinRK
rename notebooks service to contents service...
r17524 nbcontent = self.api.read('a.ipynb', 'foo').json()['content']
Thomas Kluyver
Test notebook checkpoint APIs
r13109 nb = to_notebook_json(nbcontent)
self.assertEqual(nb.worksheets, [])
# Delete cp1
MinRK
rename notebooks service to contents service...
r17524 r = self.api.delete_checkpoint('a.ipynb', 'foo', cp1['id'])
Thomas Kluyver
Test notebook checkpoint APIs
r13109 self.assertEqual(r.status_code, 204)
MinRK
rename notebooks service to contents service...
r17524 cps = self.api.get_checkpoints('a.ipynb', 'foo').json()
Thomas Kluyver
Test notebook checkpoint APIs
r13109 self.assertEqual(cps, [])