mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-14 21:43:01 +00:00
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
@@ -1527,14 +1527,10 @@ class UserUrlHandler(BaseHandler):
|
|||||||
|
|
||||||
# if request is expecting JSON, assume it's an API request and fail with 503
|
# if request is expecting JSON, assume it's an API request and fail with 503
|
||||||
# because it won't like the redirect to the pending page
|
# because it won't like the redirect to the pending page
|
||||||
if (
|
if get_accepted_mimetype(
|
||||||
get_accepted_mimetype(
|
self.request.headers.get('Accept', ''),
|
||||||
self.request.headers.get('Accept', ''),
|
choices=['application/json', 'text/html'],
|
||||||
choices=['application/json', 'text/html'],
|
) == 'application/json' or 'api' in user_path.split('/'):
|
||||||
)
|
|
||||||
== 'application/json'
|
|
||||||
or 'api' in user_path.split('/')
|
|
||||||
):
|
|
||||||
self._fail_api_request(user_name, server_name)
|
self._fail_api_request(user_name, server_name)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -1616,7 +1612,7 @@ class UserUrlHandler(BaseHandler):
|
|||||||
if redirects:
|
if redirects:
|
||||||
self.log.warning("Redirect loop detected on %s", self.request.uri)
|
self.log.warning("Redirect loop detected on %s", self.request.uri)
|
||||||
# add capped exponential backoff where cap is 10s
|
# add capped exponential backoff where cap is 10s
|
||||||
await asyncio.sleep(min(1 * (2 ** redirects), 10))
|
await asyncio.sleep(min(1 * (2**redirects), 10))
|
||||||
# rewrite target url with new `redirects` query value
|
# rewrite target url with new `redirects` query value
|
||||||
url_parts = urlparse(target)
|
url_parts = urlparse(target)
|
||||||
query_parts = parse_qs(url_parts.query)
|
query_parts = parse_qs(url_parts.query)
|
||||||
|
@@ -492,7 +492,7 @@ class SingleUserNotebookAppMixin(Configurable):
|
|||||||
i,
|
i,
|
||||||
RETRIES,
|
RETRIES,
|
||||||
)
|
)
|
||||||
await asyncio.sleep(min(2 ** i, 16))
|
await asyncio.sleep(min(2**i, 16))
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
@@ -1873,7 +1873,8 @@ async def test_auth_managed_groups(request, app, group, user):
|
|||||||
data=json.dumps({"users": [user.name]}),
|
data=json.dumps({"users": [user.name]}),
|
||||||
)
|
)
|
||||||
assert r.status_code == 400
|
assert r.status_code == 400
|
||||||
|
|
||||||
|
|
||||||
@mark.group
|
@mark.group
|
||||||
async def test_group_add_properties(app):
|
async def test_group_add_properties(app):
|
||||||
db = app.db
|
db = app.db
|
||||||
@@ -1899,6 +1900,7 @@ async def test_group_add_properties(app):
|
|||||||
properties_object[k] for k in properties_object
|
properties_object[k] for k in properties_object
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# -----------------
|
# -----------------
|
||||||
# Service API tests
|
# Service API tests
|
||||||
# -----------------
|
# -----------------
|
||||||
|
Reference in New Issue
Block a user