Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 16:44:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup

Browse source
This commit is contained in:
Amber Brown 2019-03-13 01:17:51 +11:00
parent d306bd1b26
commit 797b6a63fc
4 changed files with 17 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/handlers/test_user_directory.py
View file

@ -116,9 +116,7 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
# Check we have populated the database correctly.
shares_private = self.get_users_who_share_private_rooms()
public_users = self.get_users_in_public_rooms()
visible_users = self.get_publicly_visible_users()
self.assertEqual(visible_users, [])
self.assertEqual(
self._compress_shared(shares_private), set([(u1, u2, room), (u2, u1, room)])
)
@ -142,9 +140,7 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
# Check we have removed the values.
shares_private = self.get_users_who_share_private_rooms()
public_users = self.get_users_in_public_rooms()
visible_users = self.get_publicly_visible_users()
self.assertEqual(visible_users, [])
self.assertEqual(self._compress_shared(shares_private), set())
self.assertEqual(public_users, [])
@ -177,15 +173,6 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
retval.append((i["user_id"], i["room_id"]))
return retval
def get_publicly_visible_users(self):
return self.get_success(
self.store._simple_select_onecol(
"publicly_visible_users",
None,
"user_id",
)
)
def get_users_who_share_private_rooms(self):
return self.get_success(
self.store._simple_select_list(
@ -219,11 +206,9 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
shares_private = self.get_users_who_share_private_rooms()
public_users = self.get_users_in_public_rooms()
visible_users = self.get_publicly_visible_users()
# Nothing updated yet
self.assertEqual(shares_private, [])
self.assertEqual(visible_users, [])
self.assertEqual(public_users, [])
# Reset the handled users caches
@ -241,9 +226,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
shares_private = self.get_users_who_share_private_rooms()
public_users = self.get_users_in_public_rooms()
visible_users = self.get_publicly_visible_users()
# User 1 and User 2 share public rooms
# User 1 and User 2 are in the same public room
self.assertEqual(
set(public_users), set([(u1, room), (u2, room)])
)
@ -254,9 +238,6 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
set([(u1, u3, private_room), (u3, u1, private_room)]),
)
# User 1 and 2 are in public rooms
self.assertEqual(set(visible_users), set([u1, u2]))
def test_search_all_users(self):
"""
Search all users = True means that a user does not have to share a