diff --git a/tests/storage/test_id_generators.py b/tests/storage/test_id_generators.py
index 395396340b..2d8d1f860f 100644
--- a/tests/storage/test_id_generators.py
+++ b/tests/storage/test_id_generators.py
@@ -157,10 +157,10 @@ class MultiWriterIdGeneratorTestCase(HomeserverTestCase):
self.assertEqual(id_gen.get_positions(), {"master": 7})
self.assertEqual(id_gen.get_current_token_for_writer("master"), 7)
- ctx1 = self.get_success(id_gen.get_next())
- ctx2 = self.get_success(id_gen.get_next())
- ctx3 = self.get_success(id_gen.get_next())
- ctx4 = self.get_success(id_gen.get_next())
+ ctx1 = id_gen.get_next()
+ ctx2 = id_gen.get_next()
+ ctx3 = id_gen.get_next()
+ ctx4 = id_gen.get_next()
s1 = self.get_success(ctx1.__aenter__())
s2 = self.get_success(ctx2.__aenter__())
@@ -362,8 +362,8 @@ class MultiWriterIdGeneratorTestCase(HomeserverTestCase):
self.assertEqual(id_gen.get_current_token_for_writer("master"), 7)
# Persist two rows at once
- ctx1 = self.get_success(id_gen.get_next())
- ctx2 = self.get_success(id_gen.get_next())
+ ctx1 = id_gen.get_next()
+ ctx2 = id_gen.get_next()
s1 = self.get_success(ctx1.__aenter__())
s2 = self.get_success(ctx2.__aenter__())
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py
index 03e9cc7d4a..d8d17ef379 100644
--- a/tests/storage/test_redaction.py
+++ b/tests/storage/test_redaction.py
@@ -119,11 +119,9 @@ class RedactionTestCase(unittest.HomeserverTestCase):
return event
def test_redact(self):
- self.get_success(
- self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- )
+ self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- msg_event = self.get_success(self.inject_message(self.room1, self.u_alice, "t"))
+ msg_event = self.inject_message(self.room1, self.u_alice, "t")
# Check event has not been redacted:
event = self.get_success(self.store.get_event(msg_event.event_id))
@@ -141,9 +139,7 @@ class RedactionTestCase(unittest.HomeserverTestCase):
# Redact event
reason = "Because I said so"
- self.get_success(
- self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
- )
+ self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
event = self.get_success(self.store.get_event(msg_event.event_id))
@@ -170,14 +166,10 @@ class RedactionTestCase(unittest.HomeserverTestCase):
)
def test_redact_join(self):
- self.get_success(
- self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- )
+ self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- msg_event = self.get_success(
- self.inject_room_member(
- self.room1, self.u_bob, Membership.JOIN, extra_content={"blue": "red"}
- )
+ msg_event = self.inject_room_member(
+ self.room1, self.u_bob, Membership.JOIN, extra_content={"blue": "red"}
)
event = self.get_success(self.store.get_event(msg_event.event_id))
@@ -195,9 +187,7 @@ class RedactionTestCase(unittest.HomeserverTestCase):
# Redact event
reason = "Because I said so"
- self.get_success(
- self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
- )
+ self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
# Check redaction
@@ -311,11 +301,9 @@ class RedactionTestCase(unittest.HomeserverTestCase):
def test_redact_censor(self):
"""Test that a redacted event gets censored in the DB after a month"""
- self.get_success(
- self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- )
+ self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- msg_event = self.get_success(self.inject_message(self.room1, self.u_alice, "t"))
+ msg_event = self.inject_message(self.room1, self.u_alice, "t")
# Check event has not been redacted:
event = self.get_success(self.store.get_event(msg_event.event_id))
@@ -333,9 +321,7 @@ class RedactionTestCase(unittest.HomeserverTestCase):
# Redact event
reason = "Because I said so"
- self.get_success(
- self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
- )
+ self.inject_redaction(self.room1, msg_event.event_id, self.u_alice, reason)
event = self.get_success(self.store.get_event(msg_event.event_id))
@@ -381,25 +367,19 @@ class RedactionTestCase(unittest.HomeserverTestCase):
def test_redact_redaction(self):
"""Tests that we can redact a redaction and can fetch it again."""
- self.get_success(
- self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- )
+ self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- msg_event = self.get_success(self.inject_message(self.room1, self.u_alice, "t"))
+ msg_event = self.inject_message(self.room1, self.u_alice, "t")
- first_redact_event = self.get_success(
- self.inject_redaction(
- self.room1, msg_event.event_id, self.u_alice, "Redacting message"
- )
+ first_redact_event = self.inject_redaction(
+ self.room1, msg_event.event_id, self.u_alice, "Redacting message"
)
- self.get_success(
- self.inject_redaction(
- self.room1,
- first_redact_event.event_id,
- self.u_alice,
- "Redacting redaction",
- )
+ self.inject_redaction(
+ self.room1,
+ first_redact_event.event_id,
+ self.u_alice,
+ "Redacting redaction",
)
# Now lets jump to the future where we have censored the redaction event
@@ -414,9 +394,7 @@ class RedactionTestCase(unittest.HomeserverTestCase):
def test_store_redacted_redaction(self):
"""Tests that we can store a redacted redaction."""
- self.get_success(
- self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
- )
+ self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
builder = self.event_builder_factory.for_room_version(
RoomVersions.V1,
diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py
index eaa0d7d749..52e41cdab4 100644
--- a/tests/storage/test_stream.py
+++ b/tests/storage/test_stream.py
@@ -110,9 +110,7 @@ class PaginationTestCase(HomeserverTestCase):
def _filter_messages(self, filter: JsonDict) -> List[EventBase]:
"""Make a request to /messages with a filter, returns the chunk of events."""
- from_token = self.get_success(
- self.hs.get_event_sources().get_current_token_for_pagination()
- )
+ from_token = self.hs.get_event_sources().get_current_token_for_pagination()
events, next_key = self.get_success(
self.hs.get_datastores().main.paginate_room_events(
|
