hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-17 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1817 from minrk/server-model

Browse Source 
Always include server sub-models in user api requests
This commit is contained in:
Min RK
2018-04-24 14:12:58 +02:00
committed by GitHub
parent 82a04f7032 4281babee4
commit bd816310cb
7 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jupyterhub/tests/test_api.py
View File

@@ -200,14 +200,8 @@ def normalize_user(user):
smooths out user model with things like timestamps
for easier comparison
"""
for key in ('created', 'last_activity', 'started'):
for key in ('created', 'last_activity'):
user[key] = normalize_timestamp(user[key])
if user['progress_url']:
user['progress_url'] = re.sub(
r'.*/hub/api',
'PREFIX/hub/api',
user['progress_url'],
)
if 'servers' in user:
for server in user['servers'].values():
for key in ('started', 'last_activity'):
@@ -228,8 +222,7 @@ def fill_user(model):
model.setdefault('pending', None)
model.setdefault('created', TIMESTAMP)
model.setdefault('last_activity', TIMESTAMP)
model.setdefault('started', None)
model.setdefault('progress_url', 'PREFIX/hub/api/users/{name}/server/progress'.format(**model))
model.setdefault('servers', {})
return model