Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-16 21:34:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	synapse/rest/client/v1/login.py
This commit is contained in:
Daniel Wagner-Hall 2015-08-20 16:25:40 +01:00
commit e8cf77fa49
19 changed files with 498 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/rest/client/v2_alpha/test_register.py
View file

@ -13,6 +13,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
self.request_data = ""
self.request = Mock(
content=Mock(read=Mock(side_effect=lambda: self.request_data)),
path='/_matrix/api/v2_alpha/register'
)
self.request.args = {}
@ -131,4 +132,4 @@ class RegisterRestServletTestCase(unittest.TestCase):
})
self.registration_handler.register = Mock(return_value=("@user:id", "t"))
d = self.servlet.on_POST(self.request)
return self.assertFailure(d, SynapseError)
return self.assertFailure(d, SynapseError)