mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 21:43:21 +00:00
test_retention: Check if messages get deleted when archiving.
We add additional checks in _verify_archive_data to make sure the archived Messages and UserMessages are deleted from their normal tables.
This commit is contained in:
committed by
Tim Abbott
parent
80b834dd1b
commit
7fc48f8b93
@@ -100,6 +100,10 @@ class RetentionTestingBase(ZulipTestCase):
|
||||
set(expected_usermessage_ids)
|
||||
)
|
||||
|
||||
# Archived Messages and UserMessages should have been removed from the normal tables:
|
||||
self.assertEqual(Message.objects.filter(id__in=expected_message_ids).count(), 0)
|
||||
self.assertEqual(UserMessage.objects.filter(id__in=expected_usermessage_ids).count(), 0)
|
||||
|
||||
def _send_messages_with_attachments(self) -> Dict[str, int]:
|
||||
user_profile = self.example_user("hamlet")
|
||||
sender_email = user_profile.email
|
||||
@@ -278,10 +282,6 @@ class TestArchivingGeneral(RetentionTestingBase):
|
||||
# Make sure we archived what neeeded:
|
||||
self._verify_archive_data(expired_msg_ids, expired_usermsg_ids)
|
||||
|
||||
# Check that the archived messages were deleted:
|
||||
self.assertEqual(UserMessage.objects.filter(id__in=expired_usermsg_ids).count(), 0)
|
||||
self.assertEqual(Message.objects.filter(id__in=expired_msg_ids).count(), 0)
|
||||
|
||||
def test_archiving_attachments(self) -> None:
|
||||
"""End-to-end test for the logic for archiving attachments. This test
|
||||
is hard to read without first reading _send_messages_with_attachments"""
|
||||
|
||||
Reference in New Issue
Block a user