diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-30 12:36:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-30 12:36:40 +0100 |
| commit | 5fbdf2bcec40bf2f24fc0698440ee384595ff027 (patch) | |
| tree | de838c7f39544ba52cd94a429bb65d7222a4a7cb /tests/storage/test_roommember.py | |
| parent | Merge pull request #672 from nikriek/new-author (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-5fbdf2bcec40bf2f24fc0698440ee384595ff027.tar.xz | |
Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0
Diffstat (limited to 'tests/storage/test_roommember.py')
| -rw-r--r-- | tests/storage/test_roommember.py | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py index bab15c4165..b029ff0584 100644 --- a/tests/storage/test_roommember.py +++ b/tests/storage/test_roommember.py @@ -88,13 +88,8 @@ class RoomMemberStoreTestCase(unittest.TestCase): [m.room_id for m in ( yield self.store.get_rooms_for_user_where_membership_is( self.u_alice.to_string(), [Membership.JOIN] - )) - ] - ) - self.assertFalse( - (yield self.store.user_rooms_intersect( - [self.u_alice.to_string(), self.u_bob.to_string()] - )) + ) + )] ) @defer.inlineCallbacks @@ -108,11 +103,6 @@ class RoomMemberStoreTestCase(unittest.TestCase): yield self.store.get_room_members(self.room.to_string()) )} ) - self.assertTrue( - (yield self.store.user_rooms_intersect( - [self.u_alice.to_string(), self.u_bob.to_string()] - )) - ) @defer.inlineCallbacks def test_room_hosts(self): @@ -136,9 +126,7 @@ class RoomMemberStoreTestCase(unittest.TestCase): self.assertEquals( {"test", "elsewhere"}, - (yield - self.store.get_joined_hosts_for_room(self.room.to_string()) - ) + (yield self.store.get_joined_hosts_for_room(self.room.to_string())) ) # Should still have both hosts @@ -146,9 +134,7 @@ class RoomMemberStoreTestCase(unittest.TestCase): self.assertEquals( {"test", "elsewhere"}, - (yield - self.store.get_joined_hosts_for_room(self.room.to_string()) - ) + (yield self.store.get_joined_hosts_for_room(self.room.to_string())) ) # Should have only one host after other leaves |