diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
| commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
| tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /tests/test_federation.py | |
| parent | Add an isort configuration (#3463) (diff) | |
| parent | changelog (diff) | |
| download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz | |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'tests/test_federation.py')
| -rw-r--r-- | tests/test_federation.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py index fc80a69369..159a136971 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py @@ -1,14 +1,14 @@ -from twisted.internet.defer import succeed, maybeDeferred +from mock import Mock + +from twisted.internet.defer import maybeDeferred, succeed -from synapse.util import Clock from synapse.events import FrozenEvent from synapse.types import Requester, UserID +from synapse.util import Clock from tests import unittest -from tests.server import setup_test_homeserver, ThreadedMemoryReactorClock - -from mock import Mock +from tests.server import ThreadedMemoryReactorClock, setup_test_homeserver class MessageAcceptTests(unittest.TestCase): |