mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2025-10-09 02:28:25 -04:00
Clean up the test code for client disconnections (#12929)
* Reword failure message about `await_result=False` * Use `reactor.advance()` instead of `reactor.pump()` * Raise `AssertionError`s ourselves * Un-instance method `_test_disconnect` * Replace `ThreadedMemoryReactorClock` with `MemoryReactorClock`
This commit is contained in:
parent
586bfc6dc0
commit
3c1c40d843
6 changed files with 88 additions and 87 deletions
|
@ -24,7 +24,7 @@ from synapse.types import JsonDict
|
|||
from synapse.util.ratelimitutils import FederationRateLimiter
|
||||
|
||||
from tests import unittest
|
||||
from tests.http.server._base import EndpointCancellationTestHelperMixin
|
||||
from tests.http.server._base import test_disconnect
|
||||
|
||||
|
||||
class CancellableFederationServlet(BaseFederationServlet):
|
||||
|
@ -54,9 +54,7 @@ class CancellableFederationServlet(BaseFederationServlet):
|
|||
return HTTPStatus.OK, {"result": True}
|
||||
|
||||
|
||||
class BaseFederationServletCancellationTests(
|
||||
unittest.FederatingHomeserverTestCase, EndpointCancellationTestHelperMixin
|
||||
):
|
||||
class BaseFederationServletCancellationTests(unittest.FederatingHomeserverTestCase):
|
||||
"""Tests for `BaseFederationServlet` cancellation."""
|
||||
|
||||
skip = "`BaseFederationServlet` does not support cancellation yet."
|
||||
|
@ -86,7 +84,7 @@ class BaseFederationServletCancellationTests(
|
|||
# request won't be processed.
|
||||
self.pump()
|
||||
|
||||
self._test_disconnect(
|
||||
test_disconnect(
|
||||
self.reactor,
|
||||
channel,
|
||||
expect_cancellation=True,
|
||||
|
@ -106,7 +104,7 @@ class BaseFederationServletCancellationTests(
|
|||
# request won't be processed.
|
||||
self.pump()
|
||||
|
||||
self._test_disconnect(
|
||||
test_disconnect(
|
||||
self.reactor,
|
||||
channel,
|
||||
expect_cancellation=False,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue