mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-17 15:03:02 +00:00
Always have .servers
model on users
rather than only when named_servers is enabled. Put new-in-0.9 state there, rather than continuing to add server fields to top-level user model.
This commit is contained in:
@@ -34,7 +34,6 @@ def test_default_server(app, named_servers):
|
||||
'name': username,
|
||||
'auth_state': None,
|
||||
'server': user.url,
|
||||
'started': TIMESTAMP,
|
||||
'servers': {
|
||||
'': {
|
||||
'name': '',
|
||||
@@ -42,6 +41,7 @@ def test_default_server(app, named_servers):
|
||||
'last_activity': TIMESTAMP,
|
||||
'url': user.url,
|
||||
'pending': None,
|
||||
'ready': True,
|
||||
'progress_url': 'PREFIX/hub/api/users/{}/server/progress'.format(username),
|
||||
},
|
||||
},
|
||||
@@ -99,6 +99,7 @@ def test_create_named_server(app, named_servers):
|
||||
'last_activity': TIMESTAMP,
|
||||
'url': url_path_join(user.url, name, '/'),
|
||||
'pending': None,
|
||||
'ready': True,
|
||||
'progress_url': 'PREFIX/hub/api/users/{}/servers/{}/progress'.format(
|
||||
username, servername),
|
||||
}
|
||||
|
Reference in New Issue
Block a user