diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
| commit | a175e608e930d0facf37637876b9824b563d16aa (patch) | |
| tree | 91caa588c913c99f1184063fee871d566859c92d /tests/rest/client/test_transactions.py | |
| parent | linting (diff) | |
| parent | Make errors about email password resets much clearer (#5616) (diff) | |
| download | synapse-a175e608e930d0facf37637876b9824b563d16aa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1
Diffstat (limited to 'tests/rest/client/test_transactions.py')
| -rw-r--r-- | tests/rest/client/test_transactions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/test_transactions.py b/tests/rest/client/test_transactions.py index 708dc26e61..a8adc9a61d 100644 --- a/tests/rest/client/test_transactions.py +++ b/tests/rest/client/test_transactions.py @@ -2,9 +2,9 @@ from mock import Mock, call from twisted.internet import defer, reactor +from synapse.logging.context import LoggingContext from synapse.rest.client.transactions import CLEANUP_PERIOD_MS, HttpTransactionCache from synapse.util import Clock -from synapse.util.logcontext import LoggingContext from tests import unittest from tests.utils import MockClock |