summary refs log tree commit diff
path: root/tests/appservice/test_scheduler.py
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-05 23:49:13 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-05 23:49:13 +1000
commita175e608e930d0facf37637876b9824b563d16aa (patch)
tree91caa588c913c99f1184063fee871d566859c92d /tests/appservice/test_scheduler.py
parentlinting (diff)
parentMake errors about email password resets much clearer (#5616) (diff)
downloadsynapse-a175e608e930d0facf37637876b9824b563d16aa.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1
Diffstat (limited to '')
-rw-r--r--tests/appservice/test_scheduler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/appservice/test_scheduler.py b/tests/appservice/test_scheduler.py

index db9f86bdac..04b8c2c07c 100644 --- a/tests/appservice/test_scheduler.py +++ b/tests/appservice/test_scheduler.py
@@ -22,7 +22,7 @@ from synapse.appservice.scheduler import ( _ServiceQueuer, _TransactionController, ) -from synapse.util.logcontext import make_deferred_yieldable +from synapse.logging.context import make_deferred_yieldable from tests import unittest