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

public_export: Add logic for deleting the export tarball.

Browse Source 
The path to the uploaded tarball is reconstructed via the relative url and
removed with the canonical methods in `upload.py`.
This commit is contained in:
Wyatt Hoodes
2019-06-27 08:41:47 -10:00
committed by Tim Abbott
parent ef02de4834
commit b1900c406a
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/tests/test_upload.py
View File

@@ -24,7 +24,7 @@ from zerver.lib.upload import sanitize_name, S3UploadBackend, \
ZulipUploadBackend, MEDIUM_AVATAR_SIZE, resize_avatar, \
resize_emoji, BadImageError, get_realm_for_filename, \
DEFAULT_AVATAR_SIZE, DEFAULT_EMOJI_SIZE, exif_rotate, \
upload_export_tarball
upload_export_tarball, delete_export_tarball
import zerver.lib.upload
from zerver.models import Attachment, get_user, \
Message, UserProfile, Realm, \
@@ -1448,7 +1448,7 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
expected_url = "/user_avatars/{emoji_path}".format(emoji_path=emoji_path)
self.assertEqual(expected_url, url)
def test_tarball_upload_local(self) -> None:
def test_tarball_upload_and_deletion_local(self) -> None:
user_profile = self.example_user("iago")
self.assertTrue(user_profile.is_realm_admin)
@@ -1471,6 +1471,11 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
)
self.assertEqual(expected_url, uri)
# Delete the tarball.
self.assertIsNone(delete_export_tarball('not_a_file'))
path_id = urllib.parse.urlparse(uri).path
self.assertEqual(delete_export_tarball(path_id), path_id)
def tearDown(self) -> None:
destroy_uploads()
@@ -1742,7 +1747,7 @@ class S3Test(ZulipTestCase):
self.assertEqual(expected_url, url)
@use_s3_backend
def test_tarball_upload(self) -> None:
def test_tarball_upload_and_deletion(self) -> None:
bucket = create_s3_buckets(settings.S3_AVATAR_BUCKET)[0]
user_profile = self.example_user("iago")
@@ -1764,6 +1769,10 @@ class S3Test(ZulipTestCase):
path=os.path.basename(tarball_path))
self.assertEqual(uri, expected_url)
# Delete the tarball.
self.assertIsNone(delete_export_tarball('not_a_file'))
path_id = urllib.parse.urlparse(uri).path
self.assertEqual(delete_export_tarball(path_id), path_id)
class UploadTitleTests(TestCase):
def test_upload_titles(self) -> None: