From bcc3bb03fef2428c1ff6846e7f3f1fe41dc457f9 Mon Sep 17 00:00:00 2001 From: shanukun Date: Fri, 2 Apr 2021 22:18:08 +0530 Subject: [PATCH] refactor: Make acting_user a mandatory kwarg for bulk_remove_subscriptions. --- zerver/lib/actions.py | 3 ++- zerver/lib/test_classes.py | 2 +- zerver/tests/test_events.py | 8 ++++---- zerver/tests/test_subs.py | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 93f6b9fbf5..6c1df4c79a 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -3557,7 +3557,8 @@ def bulk_remove_subscriptions( users: Iterable[UserProfile], streams: Iterable[Stream], acting_client: Client, - acting_user: Optional[UserProfile] = None, + *, + acting_user: Optional[UserProfile], ) -> SubAndRemovedT: users = list(users) diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py index 26c497f936..abef4ec92f 100644 --- a/zerver/lib/test_classes.py +++ b/zerver/lib/test_classes.py @@ -965,7 +965,7 @@ Output: def unsubscribe(self, user_profile: UserProfile, stream_name: str) -> None: client = get_client("website") stream = get_stream(stream_name, user_profile.realm) - bulk_remove_subscriptions([user_profile], [stream], client) + bulk_remove_subscriptions([user_profile], [stream], client, acting_user=None) # Subscribe to a stream by making an API request def common_subscribe_to_streams( diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index d49daef896..86542208d4 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1570,7 +1570,7 @@ class NormalActionsTest(BaseAction): stream = get_stream("test_stream", self.user_profile.realm) action = lambda: bulk_remove_subscriptions( - [self.example_user("othello")], [stream], get_client("website") + [self.example_user("othello")], [stream], get_client("website"), acting_user=None ) events = self.verify_action(action) check_subscription_peer_remove("events[0]", events[0]) @@ -1968,7 +1968,7 @@ class SubscribeActionTest(BaseAction): # Now remove the first user, to test the normal unsubscribe flow and # 'peer_remove' event for subscribed streams. action = lambda: bulk_remove_subscriptions( - [self.example_user("othello")], [stream], get_client("website") + [self.example_user("othello")], [stream], get_client("website"), acting_user=None ) events = self.verify_action( action, @@ -1979,7 +1979,7 @@ class SubscribeActionTest(BaseAction): # Now remove the user himself, to test the 'remove' event flow action = lambda: bulk_remove_subscriptions( - [self.example_user("hamlet")], [stream], get_client("website") + [self.example_user("hamlet")], [stream], get_client("website"), acting_user=None ) events = self.verify_action( action, include_subscribers=include_subscribers, include_streams=False, num_events=2 @@ -2003,7 +2003,7 @@ class SubscribeActionTest(BaseAction): # Remove the user to test 'peer_remove' event flow for unsubscribed stream. action = lambda: bulk_remove_subscriptions( - [self.example_user("iago")], [stream], get_client("website") + [self.example_user("iago")], [stream], get_client("website"), acting_user=None ) events = self.verify_action( action, diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index a87b6d9af7..2dcb53265e 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -3865,6 +3865,7 @@ class SubscriptionAPITest(ZulipTestCase): [user1, user2], [stream1, stream2, stream3, private], get_client("website"), + acting_user=None, ) self.assert_length(query_count, 28) @@ -3934,6 +3935,7 @@ class SubscriptionAPITest(ZulipTestCase): users=[mit_user], streams=streams, acting_client=get_client("website"), + acting_user=None, ) self.assert_length(events, 0)