fixups after merge

Author: reivilibre

tests/push/test_bulk_push_rule_evaluator.py

@@ -453,7 +453,7 @@ def test_suppress_edits(self) -> None:
     @override_config({"experimental_features": {"msc4306_enabled": True}})
     def test_thread_subscriptions(self) -> None:
         bulk_evaluator = BulkPushRuleEvaluator(self.hs)
-        (thread_root_id,) = self.helper.send_events(self.room_id, 1, tok=self.token)
+        (thread_root_id,) = self.helper.send_messages(self.room_id, 1, tok=self.token)
 
         self.assertFalse(
             self._create_and_process(
@@ -501,7 +501,7 @@ def test_with_disabled_thread_subscriptions(self) -> None:
         FUTURE: If MSC4306 becomes enabled-by-default/accepted, this test is to be removed.
         """
         bulk_evaluator = BulkPushRuleEvaluator(self.hs)
-        (thread_root_id,) = self.helper.send_events(self.room_id, 1, tok=self.token)
+        (thread_root_id,) = self.helper.send_messages(self.room_id, 1, tok=self.token)
 
         # When MSC4306 is not enabled, a threaded message generates a notification
         # by default.

tests/storage/test_thread_subscriptions.py

@@ -342,14 +342,18 @@ def test_get_subscribers_to_thread(self) -> None:
         )
         self.assertEqual(subscribers, frozenset())
 
-        self._subscribe(self.thread_root_id, automatic=None, user_id=self.user_id)
+        self._subscribe(
+            self.thread_root_id, automatic_event_orderings=None, user_id=self.user_id
+        )
 
         subscribers = self.get_success(
             self.store.get_subscribers_to_thread(self.room_id, self.thread_root_id)
         )
         self.assertEqual(subscribers, frozenset((self.user_id,)))
 
-        self._subscribe(self.thread_root_id, automatic=None, user_id=other_user_id)
+        self._subscribe(
+            self.thread_root_id, automatic_event_orderings=None, user_id=other_user_id
+        )
 
         subscribers = self.get_success(
             self.store.get_subscribers_to_thread(self.room_id, self.thread_root_id)