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

pyupgrade: run pyupgrade --py36-plus and black on jupyterhub/tests

Browse Source
This commit is contained in:
Erik Sundell
2021-08-26 15:59:13 +02:00
parent 2c62c4f7ef
commit c8c7418ed2
12 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
jupyterhub/tests/test_api.py
View File

@@ -323,9 +323,12 @@ async def test_get_users_state_filter(app, state):
# has_zero: no Spawners registered at all
has_zero = add_user(db, app=app, name='has_zero')
test_usernames = set(
("has_one_active", "has_two_active", "has_two_inactive", "has_zero")
)
test_usernames = {
"has_one_active",
"has_two_active",
"has_two_inactive",
"has_zero",
}
user_states = {
"inactive": ["has_two_inactive", "has_zero"],
@@ -361,7 +364,7 @@ async def test_get_users_state_filter(app, state):
add_spawner(has_one_active, active=True, ready=False)
add_spawner(has_one_active, "inactive", active=False)
r = await api_request(app, 'users?state={}'.format(state))
r = await api_request(app, f'users?state={state}')
if state == "invalid":
assert r.status_code == 400
return
@@ -989,7 +992,7 @@ async def test_progress(request, app, no_patience, slow_spawn):
url = app_user.url
assert evt == {
'progress': 100,
'message': 'Server ready at {}'.format(url),
'message': f'Server ready at {url}',
'html_message': 'Server ready at <a href="{0}">{0}</a>'.format(url),
'url': url,
'ready': True,
@@ -1682,7 +1685,7 @@ async def test_group_add_delete_users(app):
assert [g.name for g in user.groups] == ['alphaflight']
group = orm.Group.find(db, name='alphaflight')
assert sorted([u.name for u in group.users]) == sorted(names)
assert sorted(u.name for u in group.users) == sorted(names)
r = await api_request(
app,
@@ -1698,7 +1701,7 @@ async def test_group_add_delete_users(app):
assert [g.name for g in user.groups] == ['alphaflight']
group = orm.Group.find(db, name='alphaflight')
assert sorted([u.name for u in group.users]) == sorted(names[2:])
assert sorted(u.name for u in group.users) == sorted(names[2:])
# -----------------
@@ -1812,8 +1815,8 @@ async def test_update_activity_403(app, user, admin_user):
token = user.new_api_token()
r = await api_request(
app,
"users/{}/activity".format(admin_user.name),
headers={"Authorization": "token {}".format(token)},
f"users/{admin_user.name}/activity",
headers={"Authorization": f"token {token}"},
data="{}",
method="post",
)
@@ -1824,8 +1827,8 @@ async def test_update_activity_admin(app, user, admin_user):
token = admin_user.new_api_token(roles=['admin'])
r = await api_request(
app,
"users/{}/activity".format(user.name),
headers={"Authorization": "token {}".format(token)},
f"users/{user.name}/activity",
headers={"Authorization": f"token {token}"},
data=json.dumps({"last_activity": utcnow().isoformat()}),
method="post",
)
@@ -1861,8 +1864,8 @@ async def test_update_server_activity(app, user, server_name, fresh):
r = await api_request(
app,
"users/{}/activity".format(user.name),
headers={"Authorization": "token {}".format(token)},
f"users/{user.name}/activity",
headers={"Authorization": f"token {token}"},
data=json.dumps(
{"servers": {server_name: {"last_activity": activity.isoformat()}}}
),