diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 16:31:09 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 16:31:09 +0100 |
| commit | 46dcb0d8902c531e3b187453435913fc6e2344a9 (patch) | |
| tree | 1bfb42952b976731888fb06a49e253d1037fa827 /tests/utils.py | |
| parent | Listen using SSL (diff) | |
| parent | missing semicolon (diff) | |
| download | synapse-46dcb0d8902c531e3b187453435913fc6e2344a9.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py index 37b759febc..ea7d6893c6 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -188,8 +188,9 @@ class MemoryDataStore(object): def get_rooms_for_user_where_membership_is(self, user_id, membership_list): return [ - r for r in self.members - if self.members[r].get(user_id).membership in membership_list + self.members[r].get(user_id) for r in self.members + if user_id in self.members[r] and + self.members[r][user_id].membership in membership_list ] def get_room_events_stream(self, user_id=None, from_key=None, to_key=None, |