diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-24 18:06:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-24 18:06:04 +0100 |
commit | 393a811a41d51d7967f6d455017176a20eacd85c (patch) | |
tree | 15f5bf8a8405f99f9f8a727a2ad0288759b21f85 /tests/rest/client/v1/utils.py | |
parent | Do not apply ratelimiting on joins to appservices (#8139) (diff) | |
download | synapse-393a811a41d51d7967f6d455017176a20eacd85c.tar.xz |
Fix join ratelimiter breaking profile updates and idempotency (#8153)
Diffstat (limited to 'tests/rest/client/v1/utils.py')
-rw-r--r-- | tests/rest/client/v1/utils.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/rest/client/v1/utils.py b/tests/rest/client/v1/utils.py index 8933b560d2..e66c9a4c4c 100644 --- a/tests/rest/client/v1/utils.py +++ b/tests/rest/client/v1/utils.py @@ -39,7 +39,9 @@ class RestHelper(object): resource = attr.ib() auth_user_id = attr.ib() - def create_room_as(self, room_creator=None, is_public=True, tok=None): + def create_room_as( + self, room_creator=None, is_public=True, tok=None, expect_code=200, + ): temp_id = self.auth_user_id self.auth_user_id = room_creator path = "/_matrix/client/r0/createRoom" @@ -54,9 +56,11 @@ class RestHelper(object): ) render(request, self.resource, self.hs.get_reactor()) - assert channel.result["code"] == b"200", channel.result + assert channel.result["code"] == b"%d" % expect_code, channel.result self.auth_user_id = temp_id - return channel.json_body["room_id"] + + if expect_code == 200: + return channel.json_body["room_id"] def invite(self, room=None, src=None, targ=None, expect_code=200, tok=None): self.change_membership( |