Update tests further.

Author: clokep

synapse/federation/sender/per_destination_queue.py

@@ -560,10 +560,10 @@ def _get_rr_edus(self, force_flush: bool) -> Iterable[Edu]:
         # Build the EDUs needed to send these receipts. This is a bit complicated
         # since we can share one for each unique (room, receipt type, user), but
         # need additional ones for different threads. The result is that we will
-        # send N EDUs where N is the maximum number of threads in a room.
+        # send N EDUs where N is the number of unique threads across rooms.
         #
-        # This could be slightly more efficient by bundling users who have only
-        # send receipts for different threads.
+        # This could be more efficient by bundling users who have sent receipts
+        # for different threads.
         while self._pending_rrs:
             # The next EDU's content.
             content: JsonDict = {}

tests/federation/test_federation_sender.py

@@ -90,26 +90,23 @@ def test_send_receipts_thread(self):
         )
         mock_send_transaction.return_value = make_awaitable({})
 
-        # Create receipts for the same room and user, but on two different threads,
+        # Create receipts for:
+        #
+        # * The same room / user on multiple threads.
+        # * A different user in the same room.
         sender = self.hs.get_federation_sender()
-        receipt = ReadReceipt(
-            "room_id",
-            "m.read",
-            "user_id",
-            ["event_id"],
-            thread_id=None,
-            data={"ts": 1234},
-        )
-        self.successResultOf(defer.ensureDeferred(sender.send_read_receipt(receipt)))
-        receipt = ReadReceipt(
-            "room_id",
-            "m.read",
-            "user_id",
-            ["event_id"],
-            thread_id="thread_id",
-            data={"ts": 1234},
-        )
-        self.successResultOf(defer.ensureDeferred(sender.send_read_receipt(receipt)))
+        for user, thread in (("alice", None), ("alice", "thread"), ("bob", None)):
+            receipt = ReadReceipt(
+                "room_id",
+                "m.read",
+                user,
+                ["event_id"],
+                thread_id=thread,
+                data={"ts": 1234},
+            )
+            self.successResultOf(
+                defer.ensureDeferred(sender.send_read_receipt(receipt))
+            )
 
         self.pump()
 
@@ -126,9 +123,9 @@ def test_send_receipts_thread(self):
                     "content": {
                         "room_id": {
                             "m.read": {
-                                "user_id": {
+                                "alice": {
                                     "event_ids": ["event_id"],
-                                    "data": {"ts": 1234, "thread_id": "thread_id"},
+                                    "data": {"ts": 1234, "thread_id": "thread"},
                                 }
                             }
                         }
@@ -139,10 +136,14 @@ def test_send_receipts_thread(self):
                     "content": {
                         "room_id": {
                             "m.read": {
-                                "user_id": {
+                                "alice": {
                                     "event_ids": ["event_id"],
                                     "data": {"ts": 1234},
-                                }
+                                },
+                                "bob": {
+                                    "event_ids": ["event_id"],
+                                    "data": {"ts": 1234},
+                                },
                             }
                         }
                     },