summary refs log tree commit diff
path: root/tests/http/test_fedclient.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/http/test_fedclient.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/http/test_fedclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py

index c4c0d9b968..b9d6d7ad1c 100644 --- a/tests/http/test_fedclient.py +++ b/tests/http/test_fedclient.py
@@ -29,7 +29,7 @@ from synapse.http.matrixfederationclient import ( MatrixFederationHttpClient, MatrixFederationRequest, ) -from synapse.util.logcontext import LoggingContext +from synapse.logging.context import LoggingContext from tests.server import FakeTransport from tests.unittest import HomeserverTestCase