From 6fcbd2f2d2b019e56bedee1ffd88a02a0c2e0df0 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 22 Jan 2025 16:23:51 +0000 Subject: [PATCH] test helpers: Simplify check_user_subscribed_only_to_streams. b4fedaa765cec3e9a3bad2481f7c781cadeba8a introduced this helper, and I assume that the weird loop over zip made sense at the time. The assertEqual approach on the whole set gives nice messages in modern Python. --- zerver/lib/test_classes.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py index 41a274880d..3e0eba3782 100644 --- a/zerver/lib/test_classes.py +++ b/zerver/lib/test_classes.py @@ -1511,16 +1511,10 @@ Output: return "".join(sorted(f" * {stream['name']}\n" for stream in subscribed_streams)) - def check_user_subscribed_only_to_streams( - self, user_name: str, stream_set: set[Stream] - ) -> None: - streams = sorted(stream_set, key=lambda x: x.name) + def check_user_subscribed_only_to_streams(self, user_name: str, streams: set[Stream]) -> None: + stream_names = {stream.name for stream in streams} subscribed_streams = gather_subscriptions(self.nonreg_user(user_name))[0] - - self.assert_length(subscribed_streams, len(streams)) - - for x, y in zip(subscribed_streams, streams, strict=False): - self.assertEqual(x["name"], y.name) + self.assertEqual(stream_names, {stream["name"] for stream in subscribed_streams}) def resolve_topic_containing_message( self,