mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-07-21 00:58:41 -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
|
@ -25,7 +25,7 @@ from synapse.server import HomeServer
|
|||
from synapse.types import JsonDict
|
||||
|
||||
from tests import unittest
|
||||
from tests.http.server._base import EndpointCancellationTestHelperMixin
|
||||
from tests.http.server._base import test_disconnect
|
||||
|
||||
|
||||
class CancellableReplicationEndpoint(ReplicationEndpoint):
|
||||
|
@ -69,9 +69,7 @@ class UncancellableReplicationEndpoint(ReplicationEndpoint):
|
|||
return HTTPStatus.OK, {"result": True}
|
||||
|
||||
|
||||
class ReplicationEndpointCancellationTestCase(
|
||||
unittest.HomeserverTestCase, EndpointCancellationTestHelperMixin
|
||||
):
|
||||
class ReplicationEndpointCancellationTestCase(unittest.HomeserverTestCase):
|
||||
"""Tests for `ReplicationEndpoint` cancellation."""
|
||||
|
||||
def create_test_resource(self):
|
||||
|
@ -87,7 +85,7 @@ class ReplicationEndpointCancellationTestCase(
|
|||
"""Test that handlers with the `@cancellable` flag can be cancelled."""
|
||||
path = f"{REPLICATION_PREFIX}/{CancellableReplicationEndpoint.NAME}/"
|
||||
channel = self.make_request("POST", path, await_result=False)
|
||||
self._test_disconnect(
|
||||
test_disconnect(
|
||||
self.reactor,
|
||||
channel,
|
||||
expect_cancellation=True,
|
||||
|
@ -98,7 +96,7 @@ class ReplicationEndpointCancellationTestCase(
|
|||
"""Test that handlers without the `@cancellable` flag cannot be cancelled."""
|
||||
path = f"{REPLICATION_PREFIX}/{UncancellableReplicationEndpoint.NAME}/"
|
||||
channel = self.make_request("POST", path, await_result=False)
|
||||
self._test_disconnect(
|
||||
test_disconnect(
|
||||
self.reactor,
|
||||
channel,
|
||||
expect_cancellation=False,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue