summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-07-31 13:16:20 +0100
committerNeil Johnson <neil@matrix.org>2018-07-31 13:16:20 +0100
commitdf2235e7fab44a5155134a336a4c27424398c1be (patch)
tree6b16bfbf7f05e477f396a220f62fbdc8a8bfc092 /tests
parentfix user_ips counting (diff)
downloadsynapse-df2235e7fab44a5155134a336a4c27424398c1be.tar.xz
coding style
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_auth.py4
-rw-r--r--tests/storage/test__init__.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/handlers/test_auth.py b/tests/handlers/test_auth.py

index 57f78a6bec..e01f14a10a 100644 --- a/tests/handlers/test_auth.py +++ b/tests/handlers/test_auth.py
@@ -13,16 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. from mock import Mock + import pymacaroons from twisted.internet import defer import synapse -from synapse.api.errors import AuthError import synapse.api.errors +from synapse.api.errors import AuthError from synapse.handlers.auth import AuthHandler - from tests import unittest from tests.utils import setup_test_homeserver diff --git a/tests/storage/test__init__.py b/tests/storage/test__init__.py
index c9ae349871..fe6eeeaf10 100644 --- a/tests/storage/test__init__.py +++ b/tests/storage/test__init__.py
@@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import sys from twisted.internet import defer