mirror of
https://mau.dev/maunium/synapse.git
synced 2024-11-14 14:01:59 +01:00
ffc2ee521d
* Update mypy and mypy-zope * Remove unused ignores These used to suppress ``` synapse/storage/engines/__init__.py:28: error: "__new__" must return a class instance (got "NoReturn") [misc] ``` and ``` synapse/http/matrixfederationclient.py:1270: error: "BaseException" has no attribute "reasons" [attr-defined] ``` (note that we check `hasattr(e, "reasons")` above) * Avoid empty body warnings, sometimes by marking methods as abstract E.g. ``` tests/handlers/test_register.py:58: error: Missing return statement [empty-body] tests/handlers/test_register.py:108: error: Missing return statement [empty-body] ``` * Suppress false positive about `JaegerConfig` Complaint was ``` synapse/logging/opentracing.py:450: error: Function "Type[Config]" could always be true in boolean context [truthy-function] ``` * Fix not calling `is_state()` Oops! ``` tests/rest/client/test_third_party_rules.py:428: error: Function "Callable[[], bool]" could always be true in boolean context [truthy-function] ``` * Suppress false positives from ParamSpecs ```` synapse/logging/opentracing.py:971: error: Argument 2 to "_custom_sync_async_decorator" has incompatible type "Callable[[Arg(Callable[P, R], 'func'), **P], _GeneratorContextManager[None]]"; expected "Callable[[Callable[P, R], **P], _GeneratorContextManager[None]]" [arg-type] synapse/logging/opentracing.py:1017: error: Argument 2 to "_custom_sync_async_decorator" has incompatible type "Callable[[Arg(Callable[P, R], 'func'), **P], _GeneratorContextManager[None]]"; expected "Callable[[Callable[P, R], **P], _GeneratorContextManager[None]]" [arg-type] ```` * Drive-by improvement to `wrapping_logic` annotation * Workaround false "unreachable" positives See https://github.com/Shoobx/mypy-zope/issues/91 ``` tests/http/test_proxyagent.py:626: error: Statement is unreachable [unreachable] tests/http/test_proxyagent.py:762: error: Statement is unreachable [unreachable] tests/http/test_proxyagent.py:826: error: Statement is unreachable [unreachable] tests/http/test_proxyagent.py:838: error: Statement is unreachable [unreachable] tests/http/test_proxyagent.py:845: error: Statement is unreachable [unreachable] tests/http/federation/test_matrix_federation_agent.py:151: error: Statement is unreachable [unreachable] tests/http/federation/test_matrix_federation_agent.py:452: error: Statement is unreachable [unreachable] tests/logging/test_remote_handler.py:60: error: Statement is unreachable [unreachable] tests/logging/test_remote_handler.py:93: error: Statement is unreachable [unreachable] tests/logging/test_remote_handler.py:127: error: Statement is unreachable [unreachable] tests/logging/test_remote_handler.py:152: error: Statement is unreachable [unreachable] ``` * Changelog * Tweak DBAPI2 Protocol to be accepted by mypy 1.0 Some extra context in: - https://github.com/matrix-org/python-canonicaljson/pull/57 - https://github.com/python/mypy/issues/6002 - https://mypy.readthedocs.io/en/latest/common_issues.html#covariant-subtyping-of-mutable-protocol-members-is-rejected * Pull in updated canonicaljson lib so the protocol check just works * Improve comments in opentracing I tried to workaround the ignores but found it too much trouble. I think the corresponding issue is https://github.com/python/mypy/issues/12909. The mypy repo has a PR claiming to fix this (https://github.com/python/mypy/pull/14677) which might mean this gets resolved soon? * Better annotation for INTERACTIVE_AUTH_CHECKERS * Drive-by AUTH_TYPE annotation, to remove an ignore
178 lines
6.2 KiB
Python
178 lines
6.2 KiB
Python
# Copyright 2019 The Matrix.org Foundation C.I.C.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from typing import Tuple
|
|
|
|
from twisted.internet.protocol import Protocol
|
|
from twisted.test.proto_helpers import AccumulatingProtocol, MemoryReactorClock
|
|
|
|
from synapse.logging import RemoteHandler
|
|
|
|
from tests.logging import LoggerCleanupMixin
|
|
from tests.server import FakeTransport, get_clock
|
|
from tests.unittest import TestCase
|
|
from tests.utils import checked_cast
|
|
|
|
|
|
def connect_logging_client(
|
|
reactor: MemoryReactorClock, client_id: int
|
|
) -> Tuple[Protocol, AccumulatingProtocol]:
|
|
# This is essentially tests.server.connect_client, but disabling autoflush on
|
|
# the client transport. This is necessary to avoid an infinite loop due to
|
|
# sending of data via the logging transport causing additional logs to be
|
|
# written.
|
|
factory = reactor.tcpClients.pop(client_id)[2]
|
|
client = factory.buildProtocol(None)
|
|
server = AccumulatingProtocol()
|
|
server.makeConnection(FakeTransport(client, reactor))
|
|
client.makeConnection(FakeTransport(server, reactor, autoflush=False))
|
|
|
|
return client, server
|
|
|
|
|
|
class RemoteHandlerTestCase(LoggerCleanupMixin, TestCase):
|
|
def setUp(self) -> None:
|
|
self.reactor, _ = get_clock()
|
|
|
|
def test_log_output(self) -> None:
|
|
"""
|
|
The remote handler delivers logs over TCP.
|
|
"""
|
|
handler = RemoteHandler("127.0.0.1", 9000, _reactor=self.reactor)
|
|
logger = self.get_logger(handler)
|
|
|
|
logger.info("Hello there, %s!", "wally")
|
|
|
|
# Trigger the connection
|
|
client, server = connect_logging_client(self.reactor, 0)
|
|
|
|
# Trigger data being sent
|
|
client_transport = checked_cast(FakeTransport, client.transport)
|
|
client_transport.flush()
|
|
|
|
# One log message, with a single trailing newline
|
|
logs = server.data.decode("utf8").splitlines()
|
|
self.assertEqual(len(logs), 1)
|
|
self.assertEqual(server.data.count(b"\n"), 1)
|
|
|
|
# Ensure the data passed through properly.
|
|
self.assertEqual(logs[0], "Hello there, wally!")
|
|
|
|
def test_log_backpressure_debug(self) -> None:
|
|
"""
|
|
When backpressure is hit, DEBUG logs will be shed.
|
|
"""
|
|
handler = RemoteHandler(
|
|
"127.0.0.1", 9000, maximum_buffer=10, _reactor=self.reactor
|
|
)
|
|
logger = self.get_logger(handler)
|
|
|
|
# Send some debug messages
|
|
for i in range(0, 3):
|
|
logger.debug("debug %s" % (i,))
|
|
|
|
# Send a bunch of useful messages
|
|
for i in range(0, 7):
|
|
logger.info("info %s" % (i,))
|
|
|
|
# The last debug message pushes it past the maximum buffer
|
|
logger.debug("too much debug")
|
|
|
|
# Allow the reconnection
|
|
client, server = connect_logging_client(self.reactor, 0)
|
|
client_transport = checked_cast(FakeTransport, client.transport)
|
|
client_transport.flush()
|
|
|
|
# Only the 7 infos made it through, the debugs were elided
|
|
logs = server.data.splitlines()
|
|
self.assertEqual(len(logs), 7)
|
|
self.assertNotIn(b"debug", server.data)
|
|
|
|
def test_log_backpressure_info(self) -> None:
|
|
"""
|
|
When backpressure is hit, DEBUG and INFO logs will be shed.
|
|
"""
|
|
handler = RemoteHandler(
|
|
"127.0.0.1", 9000, maximum_buffer=10, _reactor=self.reactor
|
|
)
|
|
logger = self.get_logger(handler)
|
|
|
|
# Send some debug messages
|
|
for i in range(0, 3):
|
|
logger.debug("debug %s" % (i,))
|
|
|
|
# Send a bunch of useful messages
|
|
for i in range(0, 10):
|
|
logger.warning("warn %s" % (i,))
|
|
|
|
# Send a bunch of info messages
|
|
for i in range(0, 3):
|
|
logger.info("info %s" % (i,))
|
|
|
|
# The last debug message pushes it past the maximum buffer
|
|
logger.debug("too much debug")
|
|
|
|
# Allow the reconnection
|
|
client, server = connect_logging_client(self.reactor, 0)
|
|
client_transport = checked_cast(FakeTransport, client.transport)
|
|
client_transport.flush()
|
|
|
|
# The 10 warnings made it through, the debugs and infos were elided
|
|
logs = server.data.splitlines()
|
|
self.assertEqual(len(logs), 10)
|
|
self.assertNotIn(b"debug", server.data)
|
|
self.assertNotIn(b"info", server.data)
|
|
|
|
def test_log_backpressure_cut_middle(self) -> None:
|
|
"""
|
|
When backpressure is hit, and no more DEBUG and INFOs cannot be culled,
|
|
it will cut the middle messages out.
|
|
"""
|
|
handler = RemoteHandler(
|
|
"127.0.0.1", 9000, maximum_buffer=10, _reactor=self.reactor
|
|
)
|
|
logger = self.get_logger(handler)
|
|
|
|
# Send a bunch of useful messages
|
|
for i in range(0, 20):
|
|
logger.warning("warn %s" % (i,))
|
|
|
|
# Allow the reconnection
|
|
client, server = connect_logging_client(self.reactor, 0)
|
|
client_transport = checked_cast(FakeTransport, client.transport)
|
|
client_transport.flush()
|
|
|
|
# The first five and last five warnings made it through, the debugs and
|
|
# infos were elided
|
|
logs = server.data.decode("utf8").splitlines()
|
|
self.assertEqual(
|
|
["warn %s" % (i,) for i in range(5)]
|
|
+ ["warn %s" % (i,) for i in range(15, 20)],
|
|
logs,
|
|
)
|
|
|
|
def test_cancel_connection(self) -> None:
|
|
"""
|
|
Gracefully handle the connection being cancelled.
|
|
"""
|
|
handler = RemoteHandler(
|
|
"127.0.0.1", 9000, maximum_buffer=10, _reactor=self.reactor
|
|
)
|
|
logger = self.get_logger(handler)
|
|
|
|
# Send a message.
|
|
logger.info("Hello there, %s!", "wally")
|
|
|
|
# Do not accept the connection and shutdown. This causes the pending
|
|
# connection to be cancelled (and should not raise any exceptions).
|
|
handler.close()
|