diff options
| -rw-r--r-- | synapse/federation/transport/server/_base.py | 2 | ||||
| -rw-r--r-- | tests/federation/transport/server/test__base.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/synapse/federation/transport/server/_base.py b/synapse/federation/transport/server/_base.py index 73467bccf7..103861644a 100644 --- a/synapse/federation/transport/server/_base.py +++ b/synapse/federation/transport/server/_base.py @@ -376,6 +376,8 @@ class BaseFederationServlet: if is_method_cancellable(code): # The wrapper added by `self._wrap` will inherit the cancellable flag, # but the wrapper itself does not support cancellation yet. + # Once resolved, the cancellation tests in + # `tests/federation/transport/server/test__base.py` can be re-enabled. raise Exception( f"{self.__class__.__name__}.on_{method} has been marked as " "cancellable, but federation servlets do not support cancellation " diff --git a/tests/federation/transport/server/test__base.py b/tests/federation/transport/server/test__base.py index bd90caa6ca..7d02311610 100644 --- a/tests/federation/transport/server/test__base.py +++ b/tests/federation/transport/server/test__base.py @@ -59,6 +59,8 @@ class BaseFederationServletCancellationTests( ): """Tests for `BaseFederationServlet` cancellation.""" + skip = "`BaseFederationServlet` does not support cancellation yet." + path = f"{CancellableFederationServlet.PREFIX}{CancellableFederationServlet.PATH}" def create_test_resource(self): |