summary refs log tree commit diff
diff options
context:
space:
mode:
authorSean Quah <seanq@element.io>2022-04-28 16:29:58 +0100
committerSean Quah <seanq@element.io>2022-04-28 19:28:00 +0100
commit342a502a1e08968dd2643af46eaf4105b086edf9 (patch)
tree3d9e756622bf0f71d08f2bacb97c71a4173447c4
parentTest the `@cancellable` flag on `BaseFederationServlet` methods (diff)
downloadsynapse-342a502a1e08968dd2643af46eaf4105b086edf9.tar.xz
Disable tests for the `@cancellable` flag on `BaseFederationServlet` methods
Signed-off-by: Sean Quah <seanq@element.io>
-rw-r--r--synapse/federation/transport/server/_base.py2
-rw-r--r--tests/federation/transport/server/test__base.py2
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):