OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Expose the registered device ID from the `register_appservice_user` test helper. (#11615)

pull/11895/head
reivilibre 2022-02-02 09:59:55 +00:00 committed by GitHub
parent 3f72c2a322
commit 513913cc6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11615.misc Normal file
View File

@ -0,0 +1 @@
Expose the registered device ID from the `register_appservice_user` test helper.

6
tests/handlers/test_user_directory.py
View File

@ -169,7 +169,9 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
# Register an AS user. # Register an AS user.
user = self.register_user("user", "pass") user = self.register_user("user", "pass")
token = self.login(user, "pass") token = self.login(user, "pass")
as_user = self.register_appservice_user("as_user_potato", self.appservice.token) as_user, _ = self.register_appservice_user(
"as_user_potato", self.appservice.token
)
# Join the AS user to rooms owned by the normal user. # Join the AS user to rooms owned by the normal user.
public, private = self._create_rooms_and_inject_memberships( public, private = self._create_rooms_and_inject_memberships(
@ -388,7 +390,7 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
def test_handle_local_profile_change_with_appservice_user(self) -> None: def test_handle_local_profile_change_with_appservice_user(self) -> None:
# create user # create user
as_user_id = self.register_appservice_user( as_user_id, _ = self.register_appservice_user(
"as_user_alice", self.appservice.token "as_user_alice", self.appservice.token
) )

2
tests/rest/client/test_room_batch.py
View File

@ -89,7 +89,7 @@ class RoomBatchTestCase(unittest.HomeserverTestCase):
self.clock = clock self.clock = clock
self.storage = hs.get_storage() self.storage = hs.get_storage()
self.virtual_user_id = self.register_appservice_user( self.virtual_user_id, _ = self.register_appservice_user(
"as_user_potato", self.appservice.token "as_user_potato", self.appservice.token
) )

4
tests/storage/test_user_directory.py
View File

@ -341,7 +341,9 @@ class UserDirectoryInitialPopulationTestcase(HomeserverTestCase):
# Register an AS user. # Register an AS user.
user = self.register_user("user", "pass") user = self.register_user("user", "pass")
token = self.login(user, "pass") token = self.login(user, "pass")
as_user = self.register_appservice_user("as_user_potato", self.appservice.token) as_user, _ = self.register_appservice_user(
"as_user_potato", self.appservice.token
)
# Join the AS user to rooms owned by the normal user. # Join the AS user to rooms owned by the normal user.
public, private = self._create_rooms_and_inject_memberships( public, private = self._create_rooms_and_inject_memberships(

9
tests/unittest.py
View File

@ -620,18 +620,19 @@ class HomeserverTestCase(TestCase):
self, self,
username: str, username: str,
appservice_token: str, appservice_token: str,
) -> str: ) -> Tuple[str, str]:
"""Register an appservice user as an application service. """Register an appservice user as an application service.
Requires the client-facing registration API be registered. Requires the client-facing registration API be registered.
Args: Args:
username: the user to be registered by an application service. username: the user to be registered by an application service.
Should be a full username, i.e. ""@localpart:hostname" as opposed to just "localpart" Should NOT be a full username, i.e. just "localpart" as opposed to "@localpart:hostname"
appservice_token: the acccess token for that application service. appservice_token: the acccess token for that application service.
Raises: if the request to '/register' does not return 200 OK. Raises: if the request to '/register' does not return 200 OK.
Returns: the MXID of the new user. Returns:
The MXID of the new user, the device ID of the new user's first device.
""" """
channel = self.make_request( channel = self.make_request(
"POST", "POST",
@ -643,7 +644,7 @@ class HomeserverTestCase(TestCase):
access_token=appservice_token, access_token=appservice_token,
) )
self.assertEqual(channel.code, 200, channel.json_body) self.assertEqual(channel.code, 200, channel.json_body)
return channel.json_body["user_id"] return channel.json_body["user_id"], channel.json_body["device_id"]
def login( def login(
self, self,