diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-23 23:00:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 23:00:55 +1000 |
| commit | 4806651744616bf48abf408034ab9560e33f60ce (patch) | |
| tree | 64bc7394a6316f74d0aadd9ee989e30c0c217707 /tests/http/federation | |
| parent | Opentracing Utils (#5722) (diff) | |
| download | synapse-4806651744616bf48abf408034ab9560e33f60ce.tar.xz | |
Replace returnValue with return (#5736)
Diffstat (limited to 'tests/http/federation')
| -rw-r--r-- | tests/http/federation/test_matrix_federation_agent.py | 4 | ||||
| -rw-r--r-- | tests/http/federation/test_srv_resolver.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py index a49f9b3224..b906686b49 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py @@ -145,7 +145,7 @@ class MatrixFederationAgentTests(TestCase): try: fetch_res = yield fetch_d - defer.returnValue(fetch_res) + return fetch_res except Exception as e: logger.info("Fetch of %s failed: %s", uri.decode("ascii"), e) raise @@ -936,7 +936,7 @@ class MatrixFederationAgentTests(TestCase): except Exception as e: logger.warning("Error fetching well-known: %s", e) raise - defer.returnValue(result) + return result def test_well_known_cache(self): self.reactor.lookups["testserv"] = "1.2.3.4" diff --git a/tests/http/federation/test_srv_resolver.py b/tests/http/federation/test_srv_resolver.py index 65b51dc981..3b885ef64b 100644 --- a/tests/http/federation/test_srv_resolver.py +++ b/tests/http/federation/test_srv_resolver.py @@ -61,7 +61,7 @@ class SrvResolverTestCase(unittest.TestCase): # should have restored our context self.assertIs(LoggingContext.current_context(), ctx) - defer.returnValue(result) + return result test_d = do_lookup() self.assertNoResult(test_d) |