diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:07:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:21:14 +0100 |
| commit | 998a72d4d9ec6e73000888dcdf51437ec427fbee (patch) | |
| tree | f8fa9d5deb820b49eb3a216e194ee83e14fb9eda /tests/rest/client/v1/test_events.py | |
| parent | Bump the version of twisted needed for setup_requires to 15.2.1 (diff) | |
| parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
| download | synapse-998a72d4d9ec6e73000888dcdf51437ec427fbee.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/http/matrixfederationclient.py
Diffstat (limited to 'tests/rest/client/v1/test_events.py')
| -rw-r--r-- | tests/rest/client/v1/test_events.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py index 445272e323..ac3b0b58ac 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -183,7 +183,17 @@ class EventStreamPermissionsTestCase(RestTestCase): ) self.assertEquals(200, code, msg=str(response)) - self.assertEquals(0, len(response["chunk"])) + # We may get a presence event for ourselves down + self.assertEquals( + 0, + len([ + c for c in response["chunk"] + if not ( + c.get("type") == "m.presence" + and c["content"].get("user_id") == self.user_id + ) + ]) + ) # joined room (expect all content for room) yield self.join(room=room_id, user=self.user_id, tok=self.token) |