diff --git a/jupyterhub/tests/test_api.py b/jupyterhub/tests/test_api.py index 2e351ee0..06ec377d 100644 --- a/jupyterhub/tests/test_api.py +++ b/jupyterhub/tests/test_api.py @@ -187,41 +187,6 @@ def test_referer_check(app): # User API tests # -------------- -@mark.user -@mark.gen_test -def test_get_self(app): - db = app.db - - # basic get self - r = yield api_request(app, 'user') - r.raise_for_status() - assert r.json()['kind'] == 'user' - - # identifying user via oauth token works - u = add_user(db, app=app, name='orpheus') - token = uuid.uuid4().hex - oauth_token = orm.OAuthAccessToken( - user=u.orm_user, - token=token, - grant_type=orm.GrantType.authorization_code, - ) - db.add(oauth_token) - db.commit() - r = yield api_request(app, 'user', headers={ - 'Authorization': 'token ' + token, - }) - r.raise_for_status() - model = r.json() - assert model['name'] == u.name - - # invalid auth gets 403 - r = yield api_request(app, 'user', headers={ - 'Authorization': 'token notvalid', - }) - assert r.status_code == 403 - - - @mark.user @mark.gen_test def test_get_users(app): @@ -257,6 +222,40 @@ def test_get_users(app): assert r.status_code == 403 +@mark.user +@mark.gen_test +def test_get_self(app): + db = app.db + + # basic get self + r = yield api_request(app, 'user') + r.raise_for_status() + assert r.json()['kind'] == 'user' + + # identifying user via oauth token works + u = add_user(db, app=app, name='orpheus') + token = uuid.uuid4().hex + oauth_token = orm.OAuthAccessToken( + user=u.orm_user, + token=token, + grant_type=orm.GrantType.authorization_code, + ) + db.add(oauth_token) + db.commit() + r = yield api_request(app, 'user', headers={ + 'Authorization': 'token ' + token, + }) + r.raise_for_status() + model = r.json() + assert model['name'] == u.name + + # invalid auth gets 403 + r = yield api_request(app, 'user', headers={ + 'Authorization': 'token notvalid', + }) + assert r.status_code == 403 + + @mark.user @mark.gen_test def test_add_user(app):