diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py index 711145c11e..652777f195 100644 --- a/zerver/lib/test_classes.py +++ b/zerver/lib/test_classes.py @@ -1261,6 +1261,7 @@ Output: def tornado_redirected_to_list( self, lst: List[Mapping[str, Any]], expected_num_events: int ) -> Iterator[None]: + lst.clear() real_event_queue_process_notification = django_tornado_api.process_notification django_tornado_api.process_notification = lambda notice: lst.append(notice) # process_notification takes a single parameter called 'notice'. diff --git a/zerver/tests/test_event_system.py b/zerver/tests/test_event_system.py index 28b6c69615..fa53295cfd 100644 --- a/zerver/tests/test_event_system.py +++ b/zerver/tests/test_event_system.py @@ -1134,7 +1134,6 @@ class TestUserPresenceUpdatesDisabled(ZulipTestCase): # Now check that if the realm has more than the USER_LIMIT_FOR_SENDING_PRESENCE_UPDATE_EVENTS # amount of active users, send_event doesn't get called. - events = [] with self.tornado_redirected_to_list(events, expected_num_events=0): with self.settings(USER_LIMIT_FOR_SENDING_PRESENCE_UPDATE_EVENTS=1): do_update_user_presence( diff --git a/zerver/tests/test_reactions.py b/zerver/tests/test_reactions.py index 3869d403db..517ce72b88 100644 --- a/zerver/tests/test_reactions.py +++ b/zerver/tests/test_reactions.py @@ -519,7 +519,6 @@ class ReactionEventTest(ZulipTestCase): message_after_id = self.send_stream_message( iago, "test_reactions_stream", "after subscription history private" ) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( iago, f"/api/v1/messages/{message_after_id}/reactions", reaction_info @@ -539,7 +538,6 @@ class ReactionEventTest(ZulipTestCase): # Since stream history is public to subscribers, reacting to # message_before_id should notify all subscribers: # Iago and Hamlet. - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( iago, f"/api/v1/messages/{message_before_id}/reactions", reaction_info @@ -558,7 +556,6 @@ class ReactionEventTest(ZulipTestCase): do_make_stream_web_public(stream) # For is_web_public streams, events even on old messages # should go to all subscribers, including guests like polonius. - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( iago, f"/api/v1/messages/{message_before_id}/reactions", reaction_info @@ -579,7 +576,6 @@ class ReactionEventTest(ZulipTestCase): hamlet, "hello to single receiver", ) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( hamlet, f"/api/v1/messages/{private_message_id}/reactions", reaction_info @@ -596,7 +592,6 @@ class ReactionEventTest(ZulipTestCase): [polonius, iago], "hello message to muliple receiver", ) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( polonius, f"/api/v1/messages/{huddle_message_id}/reactions", reaction_info diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index be0cbde68d..7a774fe76a 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -131,7 +131,6 @@ class TestCreateStreams(ZulipTestCase): self.assertEqual(events[0]["users"], active_non_guest_user_ids(realm.id)) self.assertEqual(events[0]["event"]["streams"][0]["name"], "Public stream") - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): ensure_stream(realm, "Private stream", invite_only=True, acting_user=None) @@ -724,7 +723,6 @@ class StreamAdminTest(ZulipTestCase): self.assertIn(cordelia.id, notified_user_ids) self.assertNotIn(prospero.id, notified_user_ids) - events = [] # Three events should be sent: a name event, an email address event and a notification event with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = get_stream("private_stream", user_profile.realm).id @@ -793,7 +791,7 @@ class StreamAdminTest(ZulipTestCase): # Test case to handle Unicode stream name change # *NOTE: Here encoding is needed when Unicode string is passed as an argument* - with self.tornado_redirected_to_list(events, expected_num_events=6): + with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = stream_name2_exists.id result = self.client_patch(f"/json/streams/{stream_id}", {"new_name": "नया नाम"}) self.assert_json_success(result) @@ -804,7 +802,7 @@ class StreamAdminTest(ZulipTestCase): # Test case to handle changing of Unicode stream name to newer name # NOTE: Unicode string being part of URL is handled cleanly # by client_patch call, encoding of URL is not needed. - with self.tornado_redirected_to_list(events, expected_num_events=9): + with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = stream_name_uni_exists.id result = self.client_patch( f"/json/streams/{stream_id}", @@ -818,7 +816,7 @@ class StreamAdminTest(ZulipTestCase): self.assertTrue(stream_name_new_uni_exists) # Test case to change name from one language to other. - with self.tornado_redirected_to_list(events, expected_num_events=12): + with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = stream_name_new_uni_exists.id result = self.client_patch(f"/json/streams/{stream_id}", {"new_name": "français"}) self.assert_json_success(result) @@ -826,7 +824,7 @@ class StreamAdminTest(ZulipTestCase): self.assertTrue(stream_name_fr_exists) # Test case to change name to mixed language name. - with self.tornado_redirected_to_list(events, expected_num_events=15): + with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = stream_name_fr_exists.id result = self.client_patch(f"/json/streams/{stream_id}", {"new_name": "français name"}) self.assert_json_success(result) @@ -838,7 +836,6 @@ class StreamAdminTest(ZulipTestCase): "stream_private_name1", realm=user_profile.realm, invite_only=True ) self.subscribe(self.example_user("cordelia"), "stream_private_name1") - del events[:] with self.tornado_redirected_to_list(events, expected_num_events=3): stream_id = get_stream("stream_private_name1", realm).id result = self.client_patch( @@ -868,7 +865,6 @@ class StreamAdminTest(ZulipTestCase): Subscription.ROLE_STREAM_ADMINISTRATOR, acting_user=None, ) - del events[:] with self.tornado_redirected_to_list(events, expected_num_events=3): result = self.client_patch( f"/json/streams/{new_stream.id}", @@ -1059,7 +1055,7 @@ class StreamAdminTest(ZulipTestCase): acting_user=None, ) - with self.tornado_redirected_to_list(events, expected_num_events=2): + with self.tornado_redirected_to_list(events, expected_num_events=1): stream_id = get_stream("stream_name1", realm).id result = self.client_patch( f"/json/streams/{stream_id}", @@ -1206,7 +1202,6 @@ class StreamAdminTest(ZulipTestCase): self.assertNotIn(self.example_user("polonius").id, notified_user_ids) self.assertEqual(stream.message_retention_days, 2) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.client_patch( f"/json/streams/{stream.id}", @@ -1229,7 +1224,6 @@ class StreamAdminTest(ZulipTestCase): stream = get_stream("stream_name1", realm) self.assertEqual(stream.message_retention_days, -1) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.client_patch( f"/json/streams/{stream.id}", @@ -2558,7 +2552,6 @@ class SubscriptionPropertiesTest(ZulipTestCase): ) self.assertEqual(sub.is_muted, True) - events = [] legacy_property_name = "in_home_view" with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( @@ -2587,7 +2580,6 @@ class SubscriptionPropertiesTest(ZulipTestCase): ) self.assertEqual(sub.is_muted, False) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.api_post( test_user, @@ -3519,7 +3511,6 @@ class SubscriptionAPITest(ZulipTestCase): self.assertEqual(num_subscribers_for_stream_id(stream.id), 2) # Now add ourselves - events = [] with self.tornado_redirected_to_list(events, expected_num_events=2): with queries_captured() as queries: self.common_subscribe_to_streams( @@ -3619,7 +3610,6 @@ class SubscriptionAPITest(ZulipTestCase): # even if realm admin is subscribed to stream cause realm admin already get # private stream creation event on stream creation. new_stream = ensure_stream(realm, "private stream", invite_only=True, acting_user=None) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=2): bulk_add_subscriptions( realm, [new_stream], [self.example_user("iago")], acting_user=None @@ -3871,7 +3861,6 @@ class SubscriptionAPITest(ZulipTestCase): ) self.assert_length(queries, 4) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=0): bulk_remove_subscriptions( users=[mit_user], diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index a814cb8968..08528fc9f7 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -194,7 +194,6 @@ class PermissionTest(ZulipTestCase): self.assertEqual(person["role"], UserProfile.ROLE_REALM_OWNER) req = dict(role=UserProfile.ROLE_MEMBER) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.client_patch(f"/json/users/{othello.id}", req) self.assert_json_success(result) @@ -207,7 +206,6 @@ class PermissionTest(ZulipTestCase): # Cannot take away from last owner self.login("desdemona") req = dict(role=UserProfile.ROLE_MEMBER) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.client_patch(f"/json/users/{iago.id}", req) self.assert_json_success(result) @@ -260,7 +258,6 @@ class PermissionTest(ZulipTestCase): # Taketh away req = dict(role=orjson.dumps(UserProfile.ROLE_MEMBER).decode()) - events = [] with self.tornado_redirected_to_list(events, expected_num_events=1): result = self.client_patch(f"/json/users/{othello.id}", req) self.assert_json_success(result)