summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
committerAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
commita1b8767da85794eb24e3b9fbce1aed87a04ea328 (patch)
treefd32dadee1bcd78d34de73c5398390c26a7cd974 /tests/test_federation.py
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parentMigrate all tests to use the dict-based config format instead of hanging item... (diff)
downloadsynapse-a1b8767da85794eb24e3b9fbce1aed87a04ea328.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r--tests/test_federation.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py

index 1a5dc32c88..6a8339b561 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py
@@ -1,4 +1,3 @@ - from mock import Mock from twisted.internet.defer import maybeDeferred, succeed