summary refs log tree commit diff
path: root/tests/http/federation/test_matrix_federation_agent.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 16:34:35 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 16:34:35 +0100
commita31eb4a9fd1c6af6de0c5162d80736eae7bdaba6 (patch)
tree1fd39929c29ecd3836bda570dbf33cc4fe2a8b7d /tests/http/federation/test_matrix_federation_agent.py
parentMerge commit 'd34c6e127' into anoa/dinsic_release_1_31_0 (diff)
parentAdd an admin API endpoint to protect media. (#9086) (diff)
downloadsynapse-a31eb4a9fd1c6af6de0c5162d80736eae7bdaba6.tar.xz
Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests/http/federation/test_matrix_federation_agent.py')
-rw-r--r--tests/http/federation/test_matrix_federation_agent.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py

index 8d0d97a53b..b758b29b2a 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py
@@ -1095,7 +1095,7 @@ class MatrixFederationAgentTests(unittest.TestCase): # Expire both caches and repeat the request self.reactor.pump((10000.0,)) - # Repated the request, this time it should fail if the lookup fails. + # Repeat the request, this time it should fail if the lookup fails. fetch_d = defer.ensureDeferred( self.well_known_resolver.get_well_known(b"testserv") ) @@ -1130,7 +1130,7 @@ class MatrixFederationAgentTests(unittest.TestCase): content=b'{ "m.server": "' + (b"a" * WELL_KNOWN_MAX_SIZE) + b'" }', ) - # The result is sucessful, but disabled delegation. + # The result is successful, but disabled delegation. r = self.successResultOf(fetch_d) self.assertIsNone(r.delegated_server)