summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-10-06 10:43:32 +0200
committerPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-10-06 15:24:59 +0200
commit9bfc61779111624e972939491a0b5c02190d3463 (patch)
tree303e11feba4c129b17b65bcb7384ee44296d0fc2 /tests/rest
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-9bfc61779111624e972939491a0b5c02190d3463.tar.xz
storage/appservice: make appservice methods only relying on the cache synchronous
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v2_alpha/test_register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 8ac56a1fb2..e9cb416e4b 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -19,7 +19,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
 
         self.appservice = None
         self.auth = Mock(get_appservice_by_req=Mock(
-            side_effect=lambda x: defer.succeed(self.appservice))
+            side_effect=lambda x: self.appservice)
         )
 
         self.auth_result = (False, None, None, None)