summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorpik <alexander.maznev@gmail.com>2016-10-18 12:17:38 -0500
committerpik <alexander.maznev@gmail.com>2016-10-18 12:17:38 -0500
commite8b1d2a45200d88a576360a83e3dff1aac4ad679 (patch)
tree65093b143547c44795535ac39edfac36d39394d9 /synapse
parentFix MockHttpRequest always returning M_UNKNOWN errcode in testing (diff)
downloadsynapse-e8b1d2a45200d88a576360a83e3dff1aac4ad679.tar.xz
Refactor test_filter to use real DataStore
 * add tests for filter api errors
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v2_alpha/filter.py4
-rw-r--r--synapse/storage/_base.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/filter.py b/synapse/rest/client/v2_alpha/filter.py
index f7758fc68c..b4084fec62 100644
--- a/synapse/rest/client/v2_alpha/filter.py
+++ b/synapse/rest/client/v2_alpha/filter.py
@@ -74,6 +74,7 @@ class CreateFilterRestServlet(RestServlet):
 
     @defer.inlineCallbacks
     def on_POST(self, request, user_id):
+
         target_user = UserID.from_string(user_id)
         requester = yield self.auth.get_user_by_req(request)
 
@@ -81,10 +82,9 @@ class CreateFilterRestServlet(RestServlet):
             raise AuthError(403, "Cannot create filters for other users")
 
         if not self.hs.is_mine(target_user):
-            raise SynapseError(400, "Can only create filters for local users")
+            raise AuthError(403, "Can only create filters for local users")
 
         content = parse_json_object_from_request(request)
-
         filter_id = yield self.filtering.add_user_filter(
             user_localpart=target_user.localpart,
             user_filter=content,
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 49fa8614f2..d828d6ee1d 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -85,7 +85,6 @@ class LoggingTransaction(object):
         sql_logger.debug("[SQL] {%s} %s", self.name, sql)
 
         sql = self.database_engine.convert_param_style(sql)
-
         if args:
             try:
                 sql_logger.debug(