From a4ae1406d15280156510d0a07e85de8203ae1e6c Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Wed, 15 Jun 2022 11:49:58 +0100
Subject: [PATCH] Fix typechecks against twisted trunk (#13061)
---
changelog.d/13061.misc | 1 +
tests/handlers/test_federation.py | 8 ++++----
tests/state/test_v2.py | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
create mode 100644 changelog.d/13061.misc
diff --git a/changelog.d/13061.misc b/changelog.d/13061.misc
new file mode 100644
index 0000000000..4c55e2b4ed
--- /dev/null
+++ b/changelog.d/13061.misc
@@ -0,0 +1 @@
+Fix type checking errors against Twisted trunk.
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index e0eda545b9..9afba7b0e8 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -119,7 +119,7 @@ class FederationTestCase(unittest.FederatingHomeserverTestCase):
join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id)
# check the state group
- sg = self.successResultOf(
+ sg = self.get_success(
self.store._get_state_group_for_event(join_event.event_id)
)
@@ -149,7 +149,7 @@ class FederationTestCase(unittest.FederatingHomeserverTestCase):
self.assertIsNotNone(e.rejected_reason)
# ... and the state group should be the same as before
- sg2 = self.successResultOf(self.store._get_state_group_for_event(ev.event_id))
+ sg2 = self.get_success(self.store._get_state_group_for_event(ev.event_id))
self.assertEqual(sg, sg2)
@@ -172,7 +172,7 @@ class FederationTestCase(unittest.FederatingHomeserverTestCase):
join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id)
# check the state group
- sg = self.successResultOf(
+ sg = self.get_success(
self.store._get_state_group_for_event(join_event.event_id)
)
@@ -203,7 +203,7 @@ class FederationTestCase(unittest.FederatingHomeserverTestCase):
self.assertIsNotNone(e.rejected_reason)
# ... and the state group should be the same as before
- sg2 = self.successResultOf(self.store._get_state_group_for_event(ev.event_id))
+ sg2 = self.get_success(self.store._get_state_group_for_event(ev.event_id))
self.assertEqual(sg, sg2)
diff --git a/tests/state/test_v2.py b/tests/state/test_v2.py
index 78b83d97b6..2e3f2318d9 100644
--- a/tests/state/test_v2.py
+++ b/tests/state/test_v2.py
@@ -495,6 +495,7 @@ class StateTestCase(unittest.TestCase):
prev_events = list(graph[node_id])
+ state_before: StateMap[str]
if len(prev_events) == 0:
state_before = {}
elif len(prev_events) == 1:
--
GitLab