Fix HTTPPusherTests by honouring mac2654 configuration

Author: bradtgmurray

synapse/push/push_tools.py

@@ -46,7 +46,10 @@ async def get_room_unread_count(room_id: str) -> None:
 
         # Beeper change: Only count a room as having unread messages if we
         # have both unread events (MSC2654) *and* notifications (ie, not muted).
-        if notify_count == 0 or notifs.main_timeline.unread_count == 0:
+        if notify_count == 0 or (
+            store.hs.config.experimental.msc2654_enabled
+            and notifs.main_timeline.unread_count == 0
+        ):
             continue
 
         if group_by_room: