diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-11 00:12:56 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 00:12:56 +1000 |
| commit | a001038b92c4f0082cad60e5e87d0bd01374c9de (patch) | |
| tree | a1d678eb7fbaa0f9715bb0e751d6e3c6e52cb3f0 /tests/util/test_linearizer.py | |
| parent | Merge branch 'rav/fix_linearizer_cancellation' into develop (diff) | |
| parent | fix up a forced long line (diff) | |
| download | synapse-a001038b92c4f0082cad60e5e87d0bd01374c9de.tar.xz | |
Merge pull request #3679 from matrix-org/hawkowl/blackify-tests
Blackify the tests
Diffstat (limited to 'tests/util/test_linearizer.py')
| -rw-r--r-- | tests/util/test_linearizer.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/util/test_linearizer.py b/tests/util/test_linearizer.py index 7f48a72de8..61a55b461b 100644 --- a/tests/util/test_linearizer.py +++ b/tests/util/test_linearizer.py @@ -26,7 +26,6 @@ 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): |