Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Stop ignoring tests/server.py #15084

Merged
merged 21 commits into from
Feb 17, 2023
Merged

Stop ignoring tests/server.py #15084

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1c58fa1
Do not ignore tests/server.py.
clokep Feb 16, 2023
3db9e3a
Clean-up type hints for FakeTransport.
clokep Feb 16, 2023
721c052
Add missing type hints to FakeChannel and FakeSite.
clokep Feb 16, 2023
a171830
Fix-up ThreadedMemoryReactorClock.
clokep Feb 16, 2023
1cabd46
Clean-up ThreadPool.
clokep Feb 16, 2023
aa5842b
Fix-up _make_test_homeserver_synchronous.
clokep Feb 16, 2023
954b748
Fix-up setup_test_homeserver.
clokep Feb 16, 2023
43e7d11
Clean-up more type hints on FakeTransport.
clokep Feb 16, 2023
e0562d6
Fix-up make_request.
clokep Feb 16, 2023
d3cbcba
Newsfragment
clokep Feb 16, 2023
8298717
Fix-up bad import.
clokep Feb 16, 2023
838ace3
Remove unused import.
clokep Feb 16, 2023
e7abbd2
Use checked_cast.
clokep Feb 17, 2023
121638a
Bytes is immutable.
clokep Feb 17, 2023
591a8af
Remove type hints in comments.
clokep Feb 17, 2023
011c5cd
Fix-up thread-pool wrappers.
clokep Feb 17, 2023
f2d22a7
Fix-up FakeTransport.loseConnection.
clokep Feb 17, 2023
854e09a
Merge remote-tracking branch 'origin/develop' into clokep/server-types
clokep Feb 17, 2023
8ee3855
Remove assertion.
clokep Feb 17, 2023
98dc5bb
Generate an exception for the failure.
clokep Feb 17, 2023
b8625d2
lint
clokep Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ exclude = (?x)
|synapse/storage/databases/__init__.py
|synapse/storage/databases/main/cache.py
|synapse/storage/schema/

|tests/server.py
)$

[mypy-synapse.federation.transport.client]
Expand Down
5 changes: 4 additions & 1 deletion tests/http/federation/test_matrix_federation_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
IOpenSSLClientConnectionCreator,
IProtocolFactory,
)
from twisted.internet.protocol import Factory
from twisted.internet.protocol import Factory, Protocol
from twisted.protocols.tls import TLSMemoryBIOFactory, TLSMemoryBIOProtocol
from twisted.web._newclient import ResponseNeverReceived
from twisted.web.client import Agent
Expand Down Expand Up @@ -466,7 +466,10 @@ def _do_get_via_proxy(
else:
assert isinstance(proxy_server_transport, FakeTransport)
client_protocol = proxy_server_transport.other
assert isinstance(client_protocol, Protocol)
c2s_transport = client_protocol.transport
assert c2s_transport is not None
assert isinstance(c2s_transport, FakeTransport)
c2s_transport.other = server_ssl_protocol

self.reactor.advance(0)
Expand Down
5 changes: 4 additions & 1 deletion tests/http/test_proxyagent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
_WrappingProtocol,
)
from twisted.internet.interfaces import IProtocol, IProtocolFactory
from twisted.internet.protocol import Factory
from twisted.internet.protocol import Factory, Protocol
from twisted.protocols.tls import TLSMemoryBIOFactory, TLSMemoryBIOProtocol
from twisted.web.http import HTTPChannel

Expand Down Expand Up @@ -644,7 +644,10 @@ def _do_https_request_via_proxy(
else:
assert isinstance(proxy_server_transport, FakeTransport)
client_protocol = proxy_server_transport.other
assert isinstance(client_protocol, Protocol)
c2s_transport = client_protocol.transport
assert c2s_transport is not None
assert isinstance(c2s_transport, FakeTransport)
c2s_transport.other = server_ssl_protocol

self.reactor.advance(0)
Expand Down
Loading