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

tests: Use read_test_image_file helper.

Browse Source
This commit is contained in:
Steve Howell
2021-12-12 16:17:33 +00:00
committed by Tim Abbott
parent 186c446458
commit 53ffb8152f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/test_helpers.py
View File

@@ -205,6 +205,11 @@ def get_test_image_file(filename: str) -> IO[bytes]:
return open(os.path.join(test_avatar_dir, filename), "rb") return open(os.path.join(test_avatar_dir, filename), "rb")
def read_test_image_file(filename: str) -> bytes:
with get_test_image_file(filename) as img_file:
return img_file.read()
def avatar_disk_path( def avatar_disk_path(
user_profile: UserProfile, medium: bool = False, original: bool = False user_profile: UserProfile, medium: bool = False, original: bool = False
) -> str: ) -> str:

10
zerver/tests/test_import_export.py
View File

@@ -42,6 +42,7 @@ from zerver.lib.test_helpers import (
get_test_image_file, get_test_image_file,
most_recent_message, most_recent_message,
most_recent_usermessage, most_recent_usermessage,
read_test_image_file,
use_s3_backend, use_s3_backend,
) )
from zerver.lib.topic_mutes import add_topic_mute from zerver.lib.topic_mutes import add_topic_mute
@@ -194,8 +195,7 @@ class RealmImportExportTest(ZulipTestCase):
upload.upload_backend.upload_realm_logo_image(img_file, user_profile, night=True) upload.upload_backend.upload_realm_logo_image(img_file, user_profile, night=True)
do_change_logo_source(realm, Realm.LOGO_UPLOADED, True, acting_user=user_profile) do_change_logo_source(realm, Realm.LOGO_UPLOADED, True, acting_user=user_profile)
with get_test_image_file("img.png") as img_file: test_image = read_test_image_file("img.png")
test_image = img_file.read()
user_profile.avatar_source = "U" user_profile.avatar_source = "U"
user_profile.save() user_profile.save()
@@ -1208,8 +1208,7 @@ class RealmImportExportTest(ZulipTestCase):
upload_path = upload.upload_backend.realm_avatar_and_logo_path(imported_realm) upload_path = upload.upload_backend.realm_avatar_and_logo_path(imported_realm)
full_upload_path = os.path.join(settings.LOCAL_UPLOADS_DIR, upload_path) full_upload_path = os.path.join(settings.LOCAL_UPLOADS_DIR, upload_path)
with get_test_image_file("img.png") as f: test_image_data = read_test_image_file("img.png")
test_image_data = f.read()
self.assertIsNotNone(test_image_data) self.assertIsNotNone(test_image_data)
with open(os.path.join(full_upload_path, "icon.original"), "rb") as f: with open(os.path.join(full_upload_path, "icon.original"), "rb") as f:
@@ -1242,8 +1241,7 @@ class RealmImportExportTest(ZulipTestCase):
do_import_realm(os.path.join(settings.TEST_WORKER_DIR, "test-export"), "test-zulip") do_import_realm(os.path.join(settings.TEST_WORKER_DIR, "test-export"), "test-zulip")
imported_realm = Realm.objects.get(string_id="test-zulip") imported_realm = Realm.objects.get(string_id="test-zulip")
with get_test_image_file("img.png") as f: test_image_data = read_test_image_file("img.png")
test_image_data = f.read()
# Test attachments # Test attachments
uploaded_file = Attachment.objects.get(realm=imported_realm) uploaded_file = Attachment.objects.get(realm=imported_realm)