paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

messages: Switch limits from sender__realm to realm.

Browse Source 
We now have a `realm_id` on Message; use it, rather than having to
check the sender's realm.  This is theoretically different for
cross-realm bots, but these changes are all in tests where that does
not apply.
This commit is contained in:
Alex Vandiver
2023-08-30 21:45:34 +00:00
committed by Tim Abbott
parent 5a0f4a1a22
commit 710524465a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/tests/test_mattermost_importer.py
View File

@@ -715,7 +715,7 @@ class MatterMostImporter(ZulipTestCase):
self.assertFalse(get_user("ron@zulip.com", realm).is_mirror_dummy)
self.assertTrue(get_user("snape@zulip.com", realm).is_mirror_dummy)
messages = Message.objects.filter(sender__realm=realm)
messages = Message.objects.filter(realm=realm)
for message in messages:
self.assertIsNotNone(message.rendered_content)
@@ -813,7 +813,7 @@ class MatterMostImporter(ZulipTestCase):
realm = get_realm("gryffindor")
messages = Message.objects.filter(sender__realm=realm)
messages = Message.objects.filter(realm=realm)
for message in messages:
self.assertIsNotNone(message.rendered_content)
self.assert_length(messages, 11)
@@ -912,8 +912,7 @@ class MatterMostImporter(ZulipTestCase):
realm = get_realm("gryffindor")
realm_users = UserProfile.objects.filter(realm=realm)
messages = Message.objects.filter(sender__in=realm_users)
messages = Message.objects.filter(realm=realm)
for message in messages:
self.assertIsNotNone(message.rendered_content)

6
zerver/tests/test_retention.py
View File

@@ -165,7 +165,7 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
def _make_expired_zulip_messages(self, message_quantity: int) -> List[int]:
msg_ids = list(
Message.objects.order_by("id")
.filter(sender__realm=self.zulip_realm)
.filter(realm=self.zulip_realm)
.values_list("id", flat=True)[3 : 3 + message_quantity]
)
self._change_messages_date_sent(
@@ -233,7 +233,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# Change some Zulip messages to be expired:
expired_zulip_msg_ids = list(
Message.objects.order_by("id")
.filter(sender__realm=self.zulip_realm)
.filter(realm=self.zulip_realm)
.values_list("id", flat=True)[3:10]
)
self._change_messages_date_sent(
@@ -266,7 +266,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# so they shouldn't get archived
zulip_msg_ids = list(
Message.objects.order_by("id")
.filter(sender__realm=self.zulip_realm)
.filter(realm=self.zulip_realm)
.values_list("id", flat=True)[3:10]
)
self._change_messages_date_sent(

2
zerver/tests/test_rocketchat_importer.py
View File

@@ -996,7 +996,7 @@ class RocketChatImporter(ZulipTestCase):
self.assertFalse(get_user("hermionegranger@email.com", realm).is_mirror_dummy)
self.assertFalse(get_user("hermionegranger@email.com", realm).is_bot)
messages = Message.objects.filter(sender__realm=realm)
messages = Message.objects.filter(realm_id=realm.id)
for message in messages:
self.assertIsNotNone(message.rendered_content)
# After removing user_joined, added_user, discussion_created, etc.