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

Resolve merge conflicts with Vertical Filtering and improve tests

Browse Source
This commit is contained in:
IvanaH8
2021-03-24 13:39:59 +01:00
parent e26e8f9c36 5947a718f0
commit bdc4bd4763
89 changed files with 1645 additions and 1711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyterhub/tests/test_api.py
View File

@@ -1707,7 +1707,7 @@ async def test_update_activity_403(app, user, admin_user):
async def test_update_activity_admin(app, user, admin_user):
token = admin_user.new_api_token()
token = admin_user.new_api_token(roles=['admin'])
r = await api_request(
app,
"users/{}/activity".format(user.name),