update tests to reflect that login no longer implies spawn

This commit is contained in:
Min RK
2018-03-21 10:51:49 +01:00
parent a0ee237ada
commit 704b172887
2 changed files with 6 additions and 10 deletions

View File

@@ -143,10 +143,6 @@ def test_referer_check(app):
if user is None: if user is None:
user = add_user(app.db, name='admin', admin=True) user = add_user(app.db, name='admin', admin=True)
cookies = yield app.login_user('admin') cookies = yield app.login_user('admin')
app_user = app.users[user]
# stop the admin's server so we don't mess up future tests
yield app.proxy.delete_user(app_user)
yield app_user.stop()
r = yield api_request(app, 'users', r = yield api_request(app, 'users',
headers={ headers={

View File

@@ -99,13 +99,13 @@ def test_create_named_server(app, named_servers):
'kind': 'user', 'kind': 'user',
'admin': False, 'admin': False,
'pending': None, 'pending': None,
'server': user.url, 'server': None,
'servers': { 'servers': {
name: { servername: {
'name': name, 'name': name,
'url': url_path_join(user.url, name, '/'), 'url': url_path_join(user.url, name, '/'),
} }
for name in ['', servername] for name in [servername]
}, },
} }
@@ -127,7 +127,7 @@ def test_delete_named_server(app, named_servers):
r = yield api_request(app, 'users', username) r = yield api_request(app, 'users', username)
r.raise_for_status() r.raise_for_status()
user_model = r.json() user_model = r.json()
user_model.pop('last_activity') user_model.pop('last_activity')
assert user_model == { assert user_model == {
@@ -136,13 +136,13 @@ def test_delete_named_server(app, named_servers):
'kind': 'user', 'kind': 'user',
'admin': False, 'admin': False,
'pending': None, 'pending': None,
'server': user.url, 'server': None,
'servers': { 'servers': {
name: { name: {
'name': name, 'name': name,
'url': url_path_join(user.url, name, '/'), 'url': url_path_join(user.url, name, '/'),
} }
for name in [''] for name in []
}, },
} }