diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-14 18:27:37 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 18:27:37 +1000 |
| commit | a61738b316db70a4184d5c355696e0a039e7867f (patch) | |
| tree | caca1a3ef0267aad2827f2f46755161d41f2ad5a /tests | |
| parent | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host (diff) | |
| download | synapse-a61738b316db70a4184d5c355696e0a039e7867f.tar.xz | |
Remove run_on_reactor (#3395)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_distributor.py | 2 | ||||
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/test_distributor.py b/tests/test_distributor.py index 010aeaee7e..c066381698 100644 --- a/tests/test_distributor.py +++ b/tests/test_distributor.py @@ -19,7 +19,6 @@ from twisted.internet import defer from mock import Mock, patch from synapse.util.distributor import Distributor -from synapse.util.async import run_on_reactor class DistributorTestCase(unittest.TestCase): @@ -95,7 +94,6 @@ class DistributorTestCase(unittest.TestCase): @defer.inlineCallbacks def observer(): - yield run_on_reactor() raise MyException("Oopsie") self.dist.observe("whail", observer) diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index 2516fe40f4..24754591df 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -18,7 +18,6 @@ import logging import mock from synapse.api.errors import SynapseError -from synapse.util import async from synapse.util import logcontext from twisted.internet import defer from synapse.util.caches import descriptors @@ -195,7 +194,6 @@ class DescriptorTestCase(unittest.TestCase): def fn(self, arg1): @defer.inlineCallbacks def inner_fn(): - yield async.run_on_reactor() raise SynapseError(400, "blah") return inner_fn() |