diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-08-27 16:33:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 16:33:41 +0100 |
| commit | 8f98260552f4f39f003bc1fbf6da159d9138081d (patch) | |
| tree | 3fb24a74ea931a454f77e2414610a7a5b506823b /tests/server.py | |
| parent | Update changelog (diff) | |
| download | synapse-8f98260552f4f39f003bc1fbf6da159d9138081d.tar.xz | |
Fix incompatibility with Twisted < 21. (#10713)
Turns out that the functionality added in #10546 to skip TLS was incompatible with older Twisted versions, so we need to be a bit more inventive. Also, add a test to (hopefully) not break this in future. Sadly, testing TLS is really hard.
Diffstat (limited to '')
| -rw-r--r-- | tests/server.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/server.py b/tests/server.py index 6fddd3b305..b861c7b866 100644 --- a/tests/server.py +++ b/tests/server.py @@ -10,9 +10,10 @@ from zope.interface import implementer from twisted.internet import address, threads, udp from twisted.internet._resolver import SimpleResolverComplexifier -from twisted.internet.defer import Deferred, fail, succeed +from twisted.internet.defer import Deferred, fail, maybeDeferred, succeed from twisted.internet.error import DNSLookupError from twisted.internet.interfaces import ( + IAddress, IHostnameResolver, IProtocol, IPullProducer, @@ -511,6 +512,9 @@ class FakeTransport: will get called back for connectionLost() notifications etc. """ + _peer_address: Optional[IAddress] = attr.ib(default=None) + """The value to be returend by getPeer""" + disconnecting = False disconnected = False connected = True @@ -519,7 +523,7 @@ class FakeTransport: autoflush = attr.ib(default=True) def getPeer(self): - return None + return self._peer_address def getHost(self): return None @@ -572,7 +576,12 @@ class FakeTransport: self.producerStreaming = streaming def _produce(): - d = self.producer.resumeProducing() + if not self.producer: + # we've been unregistered + return + # some implementations of IProducer (for example, FileSender) + # don't return a deferred. + d = maybeDeferred(self.producer.resumeProducing) d.addCallback(lambda x: self._reactor.callLater(0.1, _produce)) if not streaming: |