Move single-use methods out of `TestCase` (#12348)
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:
parent
f871222880
commit
b7762b0c9f
|
@ -0,0 +1 @@
|
||||||
|
Move single-use methods out of `TestCase`.
|
|
@ -89,6 +89,17 @@ class PasswordResetTestCase(unittest.HomeserverTestCase):
|
||||||
self.store = hs.get_datastores().main
|
self.store = hs.get_datastores().main
|
||||||
self.submit_token_resource = PasswordResetSubmitTokenResource(hs)
|
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:
|
def test_basic_password_reset(self) -> None:
|
||||||
"""Test basic password reset flow"""
|
"""Test basic password reset flow"""
|
||||||
old_password = "monkey"
|
old_password = "monkey"
|
||||||
|
|
|
@ -68,6 +68,22 @@ class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase):
|
||||||
|
|
||||||
self.wait_for_background_updates()
|
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):
|
def test_soft_failed_extremities_handled_correctly(self):
|
||||||
"""Test that extremities are correctly calculated in the presence of
|
"""Test that extremities are correctly calculated in the presence of
|
||||||
soft failed events.
|
soft failed events.
|
||||||
|
|
|
@ -717,33 +717,6 @@ class HomeserverTestCase(TestCase):
|
||||||
|
|
||||||
return event.event_id
|
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:
|
def inject_room_member(self, room: str, user: str, membership: Membership) -> None:
|
||||||
"""
|
"""
|
||||||
Inject a membership event into a room.
|
Inject a membership event into a room.
|
||||||
|
|
Loading…
Reference in New Issue