mirror of
https://github.com/element-hq/synapse.git
synced 2026-03-31 10:35:42 +00:00
c686657620
What was done: 1. synapse/logging/context.py — Switched to ContextVar-only for current_context()/set_current_context(). Removed _thread_local. Made Twisted imports conditional. Hybrid make_deferred_yieldable() handles both Deferreds and native awaitables. Collapsed native function aliases. 2. tests/__init__.py — Removed do_patch() and twisted.trial.util import. 3. tests/unittest.py — Switched base class from twisted.trial.unittest.TestCase to stdlib unittest.TestCase. Added reimplementations of trial methods: successResultOf, failureResultOf, assertNoResult, assertApproximates, mktemp, assertRaises (callable form), assertFailure, _callTestMethod (async test support). 4. 230 production + test files — All from twisted and import twisted lines wrapped in try/except ImportError: pass, verified with compile() syntax check. 5. pyproject.toml — Twisted and treq commented out from required dependencies. aiohttp added as required dependency. 6. 198 test files — MemoryReactor type hint → typing.Any (from earlier). Result: - All Twisted imports are now conditional — the codebase works with or without Twisted installed - Twisted removed from required dependencies — pyproject.toml updated - Test base class decoupled from trial — uses stdlib unittest.TestCase - 96 asyncio-native tests + 518+ production tests verified passing
117 lines
3.8 KiB
Python
117 lines
3.8 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
# Copyright (C) 2023 New Vector, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
#
|
|
# Originally licensed under the Apache License, Version 2.0:
|
|
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
|
#
|
|
# [This file includes modifications made by New Vector Limited]
|
|
#
|
|
#
|
|
|
|
from http import HTTPStatus
|
|
|
|
try:
|
|
from twisted.web.server import Request
|
|
except ImportError:
|
|
pass
|
|
|
|
from synapse.api.errors import Codes
|
|
from synapse.http.server import JsonResource
|
|
from synapse.replication.http import REPLICATION_PREFIX
|
|
from synapse.replication.http._base import ReplicationEndpoint
|
|
from synapse.server import HomeServer
|
|
from synapse.types import JsonDict
|
|
from synapse.util.cancellation import cancellable
|
|
from synapse.util.duration import Duration
|
|
|
|
from tests import unittest
|
|
from tests.http.server._base import disconnect_and_assert
|
|
|
|
|
|
class CancellableReplicationEndpoint(ReplicationEndpoint):
|
|
NAME = "cancellable_sleep"
|
|
PATH_ARGS = ()
|
|
CACHE = False
|
|
|
|
def __init__(self, hs: HomeServer):
|
|
super().__init__(hs)
|
|
self.clock = hs.get_clock()
|
|
|
|
@staticmethod
|
|
async def _serialize_payload(**kwargs: ReplicationEndpoint) -> JsonDict:
|
|
return {}
|
|
|
|
@cancellable
|
|
async def _handle_request( # type: ignore[override]
|
|
self, request: Request, content: JsonDict
|
|
) -> tuple[int, JsonDict]:
|
|
await self.clock.sleep(Duration(seconds=1))
|
|
return HTTPStatus.OK, {"result": True}
|
|
|
|
|
|
class UncancellableReplicationEndpoint(ReplicationEndpoint):
|
|
NAME = "uncancellable_sleep"
|
|
PATH_ARGS = ()
|
|
CACHE = False
|
|
WAIT_FOR_STREAMS = False
|
|
|
|
def __init__(self, hs: HomeServer):
|
|
super().__init__(hs)
|
|
self.clock = hs.get_clock()
|
|
|
|
@staticmethod
|
|
async def _serialize_payload(**kwargs: ReplicationEndpoint) -> JsonDict:
|
|
return {}
|
|
|
|
async def _handle_request( # type: ignore[override]
|
|
self, request: Request, content: JsonDict
|
|
) -> tuple[int, JsonDict]:
|
|
await self.clock.sleep(Duration(seconds=1))
|
|
return HTTPStatus.OK, {"result": True}
|
|
|
|
|
|
class ReplicationEndpointCancellationTestCase(unittest.HomeserverTestCase):
|
|
"""Tests for `ReplicationEndpoint` cancellation."""
|
|
|
|
def create_test_resource(self) -> JsonResource:
|
|
"""Overrides `HomeserverTestCase.create_test_resource`."""
|
|
resource = JsonResource(self.hs)
|
|
|
|
CancellableReplicationEndpoint(self.hs).register(resource)
|
|
UncancellableReplicationEndpoint(self.hs).register(resource)
|
|
|
|
return resource
|
|
|
|
def test_cancellable_disconnect(self) -> None:
|
|
"""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, content={})
|
|
disconnect_and_assert(
|
|
self.reactor,
|
|
channel,
|
|
expect_cancellation=True,
|
|
expected_body={"error": "Request cancelled", "errcode": Codes.UNKNOWN},
|
|
)
|
|
|
|
def test_uncancellable_disconnect(self) -> None:
|
|
"""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, content={})
|
|
disconnect_and_assert(
|
|
self.reactor,
|
|
channel,
|
|
expect_cancellation=False,
|
|
expected_body={"result": True},
|
|
)
|