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

handle progress_url in user model tests

Browse Source
This commit is contained in:
Min RK
2018-04-05 11:43:39 +02:00
parent 31d3f7a20b
commit 97cdb1a5d8
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jupyterhub/tests/test_api.py
View File

@@ -201,10 +201,17 @@ def normalize_user(user):
"""
for key in ('created', 'last_activity', 'started'):
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'):
server[key] = normalize_timestamp(server[key])
server['progress_url'] = re.sub(r'.*/hub/api', 'PREFIX/hub/api', server['progress_url'])
return user
def fill_user(model):
@@ -221,6 +228,7 @@ def fill_user(model):
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))
return model