diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
commit | e8cf77fa496de10246735fa8a11020663285bdd2 (patch) | |
tree | 7dfcf1f24dd965c8d34331fc70d1b17fbb6f03ad /tests/rest/client | |
parent | /tokenrefresh POST endpoint (diff) | |
parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-e8cf77fa496de10246735fa8a11020663285bdd2.tar.xz |
Merge branch 'develop' into refresh
Conflicts: synapse/rest/client/v1/login.py
Diffstat (limited to 'tests/rest/client')
-rw-r--r-- | tests/rest/client/v2_alpha/test_register.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index 66fd25964d..f9a2b22485 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -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) \ No newline at end of file + return self.assertFailure(d, SynapseError) |