diff --git a/zerver/lib/user_groups.py b/zerver/lib/user_groups.py index 126ffd52d8..44c5f09b4b 100644 --- a/zerver/lib/user_groups.py +++ b/zerver/lib/user_groups.py @@ -60,14 +60,6 @@ def remove_user_from_user_group(user_profile: UserProfile, user_group: UserGroup return num_deleted -def check_remove_user_from_user_group(user_profile: UserProfile, user_group: UserGroup) -> bool: - try: - num_deleted = remove_user_from_user_group(user_profile, user_group) - return bool(num_deleted) - except Exception: - return False - - def create_user_group( name: str, members: List[UserProfile], realm: Realm, description: str = "" ) -> UserGroup: diff --git a/zerver/tests/test_user_groups.py b/zerver/tests/test_user_groups.py index bd0def37bb..1a49977c9e 100644 --- a/zerver/tests/test_user_groups.py +++ b/zerver/tests/test_user_groups.py @@ -1,6 +1,5 @@ from datetime import timedelta from typing import Optional -from unittest import mock import orjson from django.utils.timezone import now as timezone_now @@ -9,7 +8,6 @@ from zerver.lib.actions import do_set_realm_property, ensure_stream from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_helpers import most_recent_usermessage from zerver.lib.user_groups import ( - check_remove_user_from_user_group, create_user_group, get_memberships_of_users, get_user_groups, @@ -52,17 +50,6 @@ class UserGroupTestCase(ZulipTestCase): self.assert_length(user_groups, 1) self.assertEqual(user_groups[0].name, "support") - def test_check_remove_user_from_user_group(self) -> None: - user_group = self.create_user_group_for_test("support") - othello = self.example_user("othello") - self.assertTrue(check_remove_user_from_user_group(othello, user_group)) - self.assertFalse(check_remove_user_from_user_group(othello, user_group)) - - with mock.patch( - "zerver.lib.user_groups.remove_user_from_user_group", side_effect=Exception - ): - self.assertFalse(check_remove_user_from_user_group(othello, user_group)) - class UserGroupAPITestCase(UserGroupTestCase): def test_user_group_create(self) -> None: