diff options
author | reivilibre <oliverw@matrix.org> | 2022-08-31 11:16:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-31 11:16:05 +0000 |
commit | 7bc110a19e6de0572b0c9513726d13298b45ced2 (patch) | |
tree | 98eb1a5b1f616c057508b1dcae61b0c8b3954dfd /tests/http/test_servlet.py | |
parent | Fix admin List Room API return type on sqlite (#13509) (diff) | |
download | synapse-7bc110a19e6de0572b0c9513726d13298b45ced2.tar.xz |
Generalise the `@cancellable` annotation so it can be used on functions other than just servlet methods. (#13662)
Diffstat (limited to 'tests/http/test_servlet.py')
-rw-r--r-- | tests/http/test_servlet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http/test_servlet.py b/tests/http/test_servlet.py index bb966c80c6..3cbca0f5a3 100644 --- a/tests/http/test_servlet.py +++ b/tests/http/test_servlet.py @@ -18,7 +18,6 @@ from typing import Tuple from unittest.mock import Mock from synapse.api.errors import Codes, SynapseError -from synapse.http.server import cancellable from synapse.http.servlet import ( RestServlet, parse_json_object_from_request, @@ -28,6 +27,7 @@ from synapse.http.site import SynapseRequest from synapse.rest.client._base import client_patterns from synapse.server import HomeServer from synapse.types import JsonDict +from synapse.util.cancellation import cancellable from tests import unittest from tests.http.server._base import test_disconnect |