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:
Min RK
2018-04-20 13:05:08 +02:00
parent 8bdb73ced4
commit 4401cdc16a
4 changed files with 54 additions and 23 deletions

View File

@@ -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),
}