Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-22 07:35:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move single-use methods out of TestCase (#12348)

Browse Source 
These methods are only used by a single testcase, so they shouldn't be
cluttering up the base `TestCase` class.
This commit is contained in:
Richard van der Hoff 2022-04-01 13:48:08 +01:00 committed by GitHub
parent f871222880
commit b7762b0c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Move single-use methods out of `TestCase`.

11
tests/rest/client/test_account.py
View File

@ -89,6 +89,17 @@ class PasswordResetTestCase(unittest.HomeserverTestCase):
self.store = hs.get_datastores().main
self.submit_token_resource = PasswordResetSubmitTokenResource(hs)
def attempt_wrong_password_login(self, username: str, password: str) -> None:
"""Attempts to login as the user with the given password, asserting
that the attempt *fails*.
"""
body = {"type": "m.login.password", "user": username, "password": password}
channel = self.make_request(
"POST", "/_matrix/client/r0/login", json.dumps(body).encode("utf8")
)
self.assertEqual(channel.code, 403, channel.result)
def test_basic_password_reset(self) -> None:
"""Test basic password reset flow"""
old_password = "monkey"

16
tests/storage/test_cleanup_extrems.py
View File

@ -68,6 +68,22 @@ class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase):
self.wait_for_background_updates()
def add_extremity(self, room_id: str, event_id: str) -> None:
"""
Add the given event as an extremity to the room.
"""
self.get_success(
self.hs.get_datastores().main.db_pool.simple_insert(
table="event_forward_extremities",
values={"room_id": room_id, "event_id": event_id},
desc="test_add_extremity",
)
)
self.hs.get_datastores().main.get_latest_event_ids_in_room.invalidate(
(room_id,)
)
def test_soft_failed_extremities_handled_correctly(self):
"""Test that extremities are correctly calculated in the presence of
soft failed events.

27
tests/unittest.py
View File

@ -717,33 +717,6 @@ class HomeserverTestCase(TestCase):
return event.event_id
def add_extremity(self, room_id, event_id):
"""
Add the given event as an extremity to the room.
"""
self.get_success(
self.hs.get_datastores().main.db_pool.simple_insert(
table="event_forward_extremities",
values={"room_id": room_id, "event_id": event_id},
desc="test_add_extremity",
)
)
self.hs.get_datastores().main.get_latest_event_ids_in_room.invalidate(
(room_id,)
)
def attempt_wrong_password_login(self, username, password):
"""Attempts to login as the user with the given password, asserting
that the attempt *fails*.
"""
body = {"type": "m.login.password", "user": username, "password": password}
channel = self.make_request(
"POST", "/_matrix/client/r0/login", json.dumps(body).encode("utf8")
)
self.assertEqual(channel.code, 403, channel.result)
def inject_room_member(self, room: str, user: str, membership: Membership) -> None:
"""
Inject a membership event into a room.