diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2022-05-11 12:25:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 12:25:13 +0100 |
| commit | 9d8e380d2e8267129de921b9b926257c36417cd2 (patch) | |
| tree | 97bb00ba5fb4ba829992529ebbfaffb1cf173a33 /tests/unittest.py | |
| parent | Respect the `@cancellable` flag for `DirectServe{Html,Json}Resource`s (#12698) (diff) | |
| download | synapse-9d8e380d2e8267129de921b9b926257c36417cd2.tar.xz | |
Respect the `@cancellable` flag for `RestServlet`s and `BaseFederationServlet`s (#12699)
Both `RestServlet`s and `BaseFederationServlet`s register their handlers with `HttpServer.register_paths` / `JsonResource.register_paths`. Update `JsonResource` to respect the `@cancellable` flag on handlers registered in this way. Although `ReplicationEndpoint` also registers itself using `register_paths`, it does not pass the handler method that would have the `@cancellable` flag directly, and so needs separate handling. Signed-off-by: Sean Quah <seanq@element.io>
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index 9afa68c164..e7f255b4fa 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -831,7 +831,7 @@ class FederatingHomeserverTestCase(HomeserverTestCase): self.site, method=method, path=path, - content=content or "", + content=content if content is not None else "", shorthand=False, await_result=await_result, custom_headers=custom_headers, |