diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
| commit | e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073 (patch) | |
| tree | a8105b0f3a9efd467f10500e933125bf203ab42e /tests/util/test_linearizer.py | |
| parent | Use set_defaults(func=) style (diff) | |
| parent | Return a different error from Invalid Password when a user is deactivated (#5... (diff) | |
| download | synapse-e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd
Diffstat (limited to 'tests/util/test_linearizer.py')
| -rw-r--r-- | tests/util/test_linearizer.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/util/test_linearizer.py b/tests/util/test_linearizer.py index ec7ba9719c..0ec8ef90ce 100644 --- a/tests/util/test_linearizer.py +++ b/tests/util/test_linearizer.py @@ -19,7 +19,8 @@ from six.moves import range from twisted.internet import defer, reactor from twisted.internet.defer import CancelledError -from synapse.util import Clock, logcontext +from synapse.logging.context import LoggingContext +from synapse.util import Clock from synapse.util.async_helpers import Linearizer from tests import unittest @@ -51,13 +52,13 @@ class LinearizerTestCase(unittest.TestCase): @defer.inlineCallbacks def func(i, sleep=False): - with logcontext.LoggingContext("func(%s)" % i) as lc: + with LoggingContext("func(%s)" % i) as lc: with (yield linearizer.queue("")): - self.assertEqual(logcontext.LoggingContext.current_context(), lc) + self.assertEqual(LoggingContext.current_context(), lc) if sleep: yield Clock(reactor).sleep(0) - self.assertEqual(logcontext.LoggingContext.current_context(), lc) + self.assertEqual(LoggingContext.current_context(), lc) func(0, sleep=True) for i in range(1, 100): |