diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-09 18:25:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-09 18:25:13 +0000 |
| commit | 6823fe52410db3b95df720b7955ad7b617dc7dee (patch) | |
| tree | 0c019d9d693b09bb10ecb6e29616e5edf00893a9 /tests | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-6823fe52410db3b95df720b7955ad7b617dc7dee.tar.xz | |
Linearize updates to membership via PUT /state/
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 4 | ||||
| -rw-r--r-- | tests/rest/client/v1/utils.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index 4fe99ebc0b..6bce352c5f 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -259,8 +259,8 @@ class RoomPermissionsTestCase(RestTestCase): # set [invite/join/left] of self, set [invite/join/left] of other, # expect all 404s because room doesn't exist on any server for usr in [self.user_id, self.rmcreator_id]: - yield self.join(room=room, user=usr, expect_code=403) - yield self.leave(room=room, user=usr, expect_code=403) + yield self.join(room=room, user=usr, expect_code=404) + yield self.leave(room=room, user=usr, expect_code=404) @defer.inlineCallbacks def test_membership_private_room_perms(self): diff --git a/tests/rest/client/v1/utils.py b/tests/rest/client/v1/utils.py index 17524b2e23..3bb1dd003a 100644 --- a/tests/rest/client/v1/utils.py +++ b/tests/rest/client/v1/utils.py @@ -87,7 +87,10 @@ class RestTestCase(unittest.TestCase): (code, response) = yield self.mock_resource.trigger( "PUT", path, json.dumps(data) ) - self.assertEquals(expect_code, code, msg=str(response)) + self.assertEquals( + expect_code, code, + msg="Expected: %d, got: %d, resp: %r" % (expect_code, code, response) + ) self.auth_user_id = temp_id |