diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
| commit | fc5d937550816573bd151f5a322629d12846317d (patch) | |
| tree | 5d7e59799bd513718ea3f78431aa8c4c7ab087b3 /tests/util/test_linearizer.py | |
| parent | wip cut at sending resource server notices (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-fc5d937550816573bd151f5a322629d12846317d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'tests/util/test_linearizer.py')
| -rw-r--r-- | tests/util/test_linearizer.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/util/test_linearizer.py b/tests/util/test_linearizer.py index 4729bd5a0a..61a55b461b 100644 --- a/tests/util/test_linearizer.py +++ b/tests/util/test_linearizer.py @@ -20,13 +20,12 @@ from twisted.internet import defer, reactor from twisted.internet.defer import CancelledError from synapse.util import Clock, logcontext -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from tests import unittest class LinearizerTestCase(unittest.TestCase): - @defer.inlineCallbacks def test_linearizer(self): linearizer = Linearizer() @@ -54,13 +53,11 @@ class LinearizerTestCase(unittest.TestCase): def func(i, sleep=False): with logcontext.LoggingContext("func(%s)" % i) as lc: with (yield linearizer.queue("")): - self.assertEqual( - logcontext.LoggingContext.current_context(), lc) + self.assertEqual(logcontext.LoggingContext.current_context(), lc) if sleep: yield Clock(reactor).sleep(0) - self.assertEqual( - logcontext.LoggingContext.current_context(), lc) + self.assertEqual(logcontext.LoggingContext.current_context(), lc) func(0, sleep=True) for i in range(1, 100): |