OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix tests

pull/649/head
David Baker 2016-03-16 14:25:14 +00:00
parent 99797947aa
commit ff7d3dc3a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/rest/client/v2_alpha/test_register.py
View File

@ -22,9 +22,10 @@ class RegisterRestServletTestCase(unittest.TestCase):
side_effect=lambda x: defer.succeed(self.appservice)) side_effect=lambda x: defer.succeed(self.appservice))
) )
self.auth_result = (False, None, None) self.auth_result = (False, None, None, None)
self.auth_handler = Mock( 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),
get_session_data=Mock(return_value=None)
) )
self.registration_handler = Mock() self.registration_handler = Mock()
self.identity_handler = Mock() self.identity_handler = Mock()
@ -112,7 +113,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
self.auth_result = (True, None, { self.auth_result = (True, None, {
"username": "kermit", "username": "kermit",
"password": "monkey" "password": "monkey"
}) }, None)
self.registration_handler.register = Mock(return_value=(user_id, token)) self.registration_handler.register = Mock(return_value=(user_id, token))
(code, result) = yield self.servlet.on_POST(self.request) (code, result) = yield self.servlet.on_POST(self.request)
@ -135,7 +136,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
self.auth_result = (True, None, { self.auth_result = (True, None, {
"username": "kermit", "username": "kermit",
"password": "monkey" "password": "monkey"
}) }, None)
self.registration_handler.register = Mock(return_value=("@user:id", "t")) self.registration_handler.register = Mock(return_value=("@user:id", "t"))
d = self.servlet.on_POST(self.request) d = self.servlet.on_POST(self.request)
return self.assertFailure(d, SynapseError) return self.assertFailure(d, SynapseError)