hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up vertical spacing

Browse Source
This commit is contained in:
Carol Willing
2017-01-20 23:32:33 -08:00
parent f1d7e5e779
commit 025977f19a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jupyterhub/tests/test_api.py
View File

@@ -43,7 +43,8 @@ def check_db_locks(func):
def find_user(db, name): def find_user(db, name):
return db.query(orm.User).filter(orm.User.name==name).first() return db.query(orm.User).filter(orm.User.name == name).first()
def add_user(db, app=None, **kwargs): def add_user(db, app=None, **kwargs):
orm_user = find_user(db, name=kwargs.get('name')) orm_user = find_user(db, name=kwargs.get('name'))
@@ -60,6 +61,7 @@ def add_user(db, app=None, **kwargs):
else: else:
return orm_user return orm_user
def auth_header(db, name): def auth_header(db, name):
user = find_user(db, name) user = find_user(db, name)
if user is None: if user is None:
@@ -67,6 +69,7 @@ def auth_header(db, name):
token = user.new_api_token() token = user.new_api_token()
return {'Authorization': 'token %s' % token} return {'Authorization': 'token %s' % token}
@check_db_locks @check_db_locks
def api_request(app, *api_path, **kwargs): def api_request(app, *api_path, **kwargs):
"""Make an API request""" """Make an API request"""
@@ -85,6 +88,7 @@ def api_request(app, *api_path, **kwargs):
assert 'http' not in resp.headers['Content-Security-Policy'] assert 'http' not in resp.headers['Content-Security-Policy']
return resp return resp
def test_auth_api(app): def test_auth_api(app):
db = app.db db = app.db
r = api_request(app, 'authorizations', 'gobbledygook') r = api_request(app, 'authorizations', 'gobbledygook')
@@ -157,6 +161,7 @@ def test_referer_check(app, io_loop):
# user API tests # user API tests
@mark.user @mark.user
def test_get_users(app): def test_get_users(app):
db = app.db db = app.db
@@ -353,6 +358,7 @@ def get_app_user(app, name):
No ORM methods should be called on the result. No ORM methods should be called on the result.
""" """
q = Queue() q = Queue()
def get_user_id(): def get_user_id():
user = find_user(app.db, name) user = find_user(app.db, name)
q.put(user.id) q.put(user.id)
@@ -552,7 +558,6 @@ def test_bad_get_token(app):
})) }))
assert r.status_code == 403 assert r.status_code == 403
# group API tests
@mark.group @mark.group
def test_groups_list(app): def test_groups_list(app):