diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_user_directory.py | 51 |
1 files changed, 3 insertions, 48 deletions
diff --git a/tests/storage/test_user_directory.py b/tests/storage/test_user_directory.py index eff62e42e4..0dde1ab2fe 100644 --- a/tests/storage/test_user_directory.py +++ b/tests/storage/test_user_directory.py @@ -15,6 +15,7 @@ from twisted.internet import defer +from synapse.storage import UserDirectoryStore from synapse.storage.roommember import ProfileInfo from tests import unittest @@ -23,14 +24,13 @@ from tests.utils import setup_test_homeserver ALICE = "@alice:a" BOB = "@bob:b" BOBBY = "@bobby:a" -ROOM = "!room:id" class UserDirectoryStoreTestCase(unittest.TestCase): @defer.inlineCallbacks def setUp(self): self.hs = yield setup_test_homeserver(self.addCleanup) - self.store = self.hs.get_datastore() + self.store = UserDirectoryStore(self.hs.get_db_conn(), self.hs) # alice and bob are both in !room_id. bobby is not but shares # a homeserver with alice. @@ -42,7 +42,7 @@ class UserDirectoryStoreTestCase(unittest.TestCase): BOBBY: ProfileInfo(None, "bobby"), }, ) - yield self.store.add_users_to_public_room(ROOM, [ALICE, BOB]) + yield self.store.add_users_to_public_room("!room:id", [ALICE, BOB]) yield self.store.add_users_who_share_room( "!room:id", False, ((ALICE, BOB), (BOB, ALICE)) ) @@ -75,48 +75,3 @@ class UserDirectoryStoreTestCase(unittest.TestCase): ) finally: self.hs.config.user_directory_search_all_users = False - - # @defer.inlineCallbacks - # def test_cannot_add_support_user_to_directory(self): - # self.hs.config.user_directory_search_all_users = True - # SUPPORT_USER = "@support:test" - # SUPPOER_USER_SCREEN_NAME = "Support" - # - # yield self.store.register(user_id=SUPPORT_USER, token="123", - # password_hash=None, - # user_type=UserTypes.SUPPORT) - # yield self.store.register(user_id=ALICE, token="456", password_hash=None) - # - # yield self.store.add_profiles_to_user_dir( - # ROOM, - # {SUPPORT_USER: ProfileInfo(None, SUPPOER_USER_SCREEN_NAME)}, - # ) - # yield self.store.add_users_to_public_room(ROOM, [SUPPORT_USER]) - # yield self.store.add_users_who_share_room( - # ROOM, False, ((ALICE, SUPPORT_USER),) - # ) - # - # r = yield self.store.search_user_dir(ALICE, SUPPOER_USER_SCREEN_NAME, 10) - # self.assertFalse(r["limited"]) - # self.assertEqual(0, len(r["results"])) - # - # # Check that enabled support user does not prevent all users being added - # r = yield self.store.search_user_dir(ALICE, ALICE, 10) - # self.assertFalse(r["limited"]) - # self.assertEqual(1, len(r["results"])) - # - # yield self.store.update_user_in_user_dir(SUPPORT_USER, ROOM) - # yield self.store.update_profile_in_user_dir( - # SUPPORT_USER, SUPPOER_USER_SCREEN_NAME, None, ROOM - # ) - # yield self.store.update_user_in_public_user_list(SUPPORT_USER, ROOM) - # - # r = yield self.store.search_user_dir(ALICE, SUPPOER_USER_SCREEN_NAME, 10) - # self.assertFalse(r["limited"]) - # self.assertEqual(0, len(r["results"])) - # - # r = yield self.store.get_user_in_directory(SUPPORT_USER) - # self.assertEqual(r, None) - # - # r = yield self.store.get_user_in_public_room(SUPPORT_USER) - # self.assertEqual(r, None) |