diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
index 16dce6c723..84334dce34 100644
--- a/tests/rest/client/v2_alpha/__init__.py
+++ b/tests/rest/client/v2_alpha/__init__.py
@@ -55,7 +55,7 @@ class V2AlphaRestTestCase(unittest.TestCase):
r.register_servlets(hs, self.mock_resource)
def make_datastore_mock(self):
- store = Mock(spec=[
+ store = Mock(spec=[
"insert_client_ip",
])
store.get_app_service_by_token = Mock(return_value=None)
diff --git a/tests/rest/client/v2_alpha/test_filter.py b/tests/rest/client/v2_alpha/test_filter.py
index c86e904c8e..d1442aafac 100644
--- a/tests/rest/client/v2_alpha/test_filter.py
+++ b/tests/rest/client/v2_alpha/test_filter.py
@@ -15,8 +15,6 @@
from twisted.internet import defer
-from mock import Mock
-
from . import V2AlphaRestTestCase
from synapse.rest.client.v2_alpha import filter
@@ -53,9 +51,8 @@ class FilterTestCase(V2AlphaRestTestCase):
@defer.inlineCallbacks
def test_add_filter(self):
- (code, response) = yield self.mock_resource.trigger("POST",
- "/user/%s/filter" % (self.USER_ID),
- '{"type": ["m.*"]}'
+ (code, response) = yield self.mock_resource.trigger(
+ "POST", "/user/%s/filter" % (self.USER_ID), '{"type": ["m.*"]}'
)
self.assertEquals(200, code)
self.assertEquals({"filter_id": "0"}, response)
@@ -70,8 +67,8 @@ class FilterTestCase(V2AlphaRestTestCase):
{"type": ["m.*"]}
]
- (code, response) = yield self.mock_resource.trigger("GET",
- "/user/%s/filter/0" % (self.USER_ID), None
+ (code, response) = yield self.mock_resource.trigger_get(
+ "/user/%s/filter/0" % (self.USER_ID)
)
self.assertEquals(200, code)
self.assertEquals({"type": ["m.*"]}, response)
@@ -82,14 +79,14 @@ class FilterTestCase(V2AlphaRestTestCase):
{"type": ["m.*"]}
]
- (code, response) = yield self.mock_resource.trigger("GET",
- "/user/%s/filter/2" % (self.USER_ID), None
+ (code, response) = yield self.mock_resource.trigger_get(
+ "/user/%s/filter/2" % (self.USER_ID)
)
self.assertEquals(404, code)
@defer.inlineCallbacks
def test_get_filter_no_user(self):
- (code, response) = yield self.mock_resource.trigger("GET",
- "/user/%s/filter/0" % (self.USER_ID), None
+ (code, response) = yield self.mock_resource.trigger_get(
+ "/user/%s/filter/0" % (self.USER_ID)
)
self.assertEquals(404, code)
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index df0841b0b1..b867599079 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -1,7 +1,7 @@
from synapse.rest.client.v2_alpha.register import RegisterRestServlet
from synapse.api.errors import SynapseError
from twisted.internet import defer
-from mock import Mock, MagicMock
+from mock import Mock
from tests import unittest
import json
@@ -24,7 +24,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
self.auth_result = (False, None, None)
self.auth_handler = Mock(
- check_auth=Mock(side_effect=lambda x,y,z: self.auth_result)
+ check_auth=Mock(side_effect=lambda x, y, z: self.auth_result)
)
self.registration_handler = Mock()
self.identity_handler = Mock()
|
