Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/test_server.py b/tests/test_server.py

index 8ad822c43b..4192013f6d 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -4,9 +4,10 @@ import re
 from twisted.internet.defer import Deferred
 from twisted.test.proto_helpers import MemoryReactorClock
 
-from synapse.util import Clock
 from synapse.api.errors import Codes, SynapseError
 from synapse.http.server import JsonResource
+from synapse.util import Clock
+
 from tests import unittest
 from tests.server import make_request, setup_test_homeserver