mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 22:13:26 +00:00
Move upload-related tests to test_upload.py.
Move S3Test, FileUploadTest and SanitizeNameTests from test_external.py to test_upload.py.
This commit is contained in:
Eklavya Sharma
committed by
Tim Abbott
Tim Abbott
parent
c75c5fb3e1
commit
2d60a1d0f3
@@ -3,7 +3,6 @@ from __future__ import absolute_import
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.test import TestCase
|
||||
from unittest import skip
|
||||
|
||||
from zerver.forms import not_mit_mailing_list
|
||||
|
||||
@@ -17,15 +16,11 @@ from zerver.lib.actions import compute_mit_user_fullname
|
||||
from zerver.lib.test_helpers import AuthedTestCase
|
||||
from zerver.models import get_user_profile_by_email
|
||||
from zerver.lib.test_runner import slow
|
||||
from zerver.lib.upload import sanitize_name
|
||||
|
||||
import time
|
||||
import ujson
|
||||
from six.moves import urllib
|
||||
|
||||
from boto.s3.connection import S3Connection
|
||||
from boto.s3.key import Key
|
||||
from six.moves import StringIO
|
||||
from six.moves import range
|
||||
|
||||
class MITNameTest(TestCase):
|
||||
@@ -42,76 +37,6 @@ class MITNameTest(TestCase):
|
||||
def test_notmailinglist(self):
|
||||
self.assertTrue(not_mit_mailing_list("sipbexch@mit.edu"))
|
||||
|
||||
class S3Test(AuthedTestCase):
|
||||
# full URIs in public bucket
|
||||
test_uris = [] # type: List[str]
|
||||
# keys in authed bucket
|
||||
test_keys = [] # type: List[str]
|
||||
|
||||
@slow(2.6, "has to contact external S3 service")
|
||||
@skip("Need S3 mock")
|
||||
def test_file_upload_authed(self):
|
||||
"""
|
||||
A call to /json/upload_file should return a uri and actually create an object.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
fp = StringIO("zulip!")
|
||||
fp.name = "zulip.txt"
|
||||
|
||||
result = self.client.post("/json/upload_file", {'file': fp})
|
||||
self.assert_json_success(result)
|
||||
json = ujson.loads(result.content)
|
||||
self.assertIn("uri", json)
|
||||
uri = json["uri"]
|
||||
base = '/user_uploads/'
|
||||
self.assertEquals(base, uri[:len(base)])
|
||||
self.test_keys.append(uri[len(base):])
|
||||
|
||||
response = self.client.get(uri)
|
||||
redirect_url = response['Location']
|
||||
|
||||
self.assertEquals("zulip!", urllib.request.urlopen(redirect_url).read().strip())
|
||||
|
||||
def tearDown(self):
|
||||
# clean up
|
||||
return
|
||||
# TODO: un-deadden this code when we have proper S3 mocking.
|
||||
conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY)
|
||||
for uri in self.test_uris:
|
||||
key = Key(conn.get_bucket(settings.S3_BUCKET))
|
||||
key.name = urllib.parse.urlparse(uri).path[1:]
|
||||
key.delete()
|
||||
self.test_uris.remove(uri)
|
||||
|
||||
for path in self.test_keys:
|
||||
key = Key(conn.get_bucket(settings.S3_AUTH_UPLOADS_BUCKET))
|
||||
key.name = path
|
||||
key.delete()
|
||||
self.test_keys.remove(path)
|
||||
|
||||
class FileUploadTest(AuthedTestCase):
|
||||
def test_multiple_upload_failure(self):
|
||||
"""
|
||||
Attempting to upload two files should fail.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
fp = StringIO("bah!")
|
||||
fp.name = "a.txt"
|
||||
fp2 = StringIO("pshaw!")
|
||||
fp2.name = "b.txt"
|
||||
|
||||
result = self.client.post("/json/upload_file", {'f1': fp, 'f2': fp2})
|
||||
self.assert_json_error(result, "You may only upload one file at a time")
|
||||
|
||||
def test_no_file_upload_failure(self):
|
||||
"""
|
||||
Calling this endpoint with no files should fail.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
|
||||
result = self.client.post("/json/upload_file")
|
||||
self.assert_json_error(result, "You must specify a file to upload")
|
||||
|
||||
class RateLimitTests(AuthedTestCase):
|
||||
|
||||
def setUp(self):
|
||||
@@ -228,16 +153,3 @@ class GCMTokenTests(AuthedTestCase):
|
||||
self.login("hamlet@zulip.com")
|
||||
result = self.client.post('/json/users/me/android_gcm_reg_id', {'token':token})
|
||||
self.assert_json_success(result)
|
||||
|
||||
class SanitizeNameTests(TestCase):
|
||||
def test_file_name(self):
|
||||
self.assertEquals(sanitize_name(u'test.txt'), u'test.txt')
|
||||
self.assertEquals(sanitize_name(u'.hidden'), u'.hidden')
|
||||
self.assertEquals(sanitize_name(u'.hidden.txt'), u'.hidden.txt')
|
||||
self.assertEquals(sanitize_name(u'tarball.tar.gz'), u'tarball.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'.hidden_tarball.tar.gz'), u'.hidden_tarball.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'Testing{}*&*#().ta&&%$##&&r.gz'), u'Testing.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'*testingfile?*.txt'), u'testingfile.txt')
|
||||
self.assertEquals(sanitize_name(u'snowman☃.txt'), u'snowman.txt')
|
||||
self.assertEquals(sanitize_name(u'테스트.txt'), u'테스트.txt')
|
||||
self.assertEquals(sanitize_name(u'~/."\`\?*"u0`000ssh/test.t**{}ar.gz'), u'.u0000sshtest.tar.gz')
|
||||
|
||||
99
zerver/tests/test_upload.py
Normal file
99
zerver/tests/test_upload.py
Normal file
@@ -0,0 +1,99 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import absolute_import
|
||||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
from unittest import skip
|
||||
|
||||
from zerver.lib.test_helpers import AuthedTestCase
|
||||
from zerver.lib.test_runner import slow
|
||||
from zerver.lib.upload import sanitize_name
|
||||
|
||||
import ujson
|
||||
from six.moves import urllib
|
||||
|
||||
from boto.s3.connection import S3Connection
|
||||
from boto.s3.key import Key
|
||||
from six.moves import StringIO
|
||||
|
||||
class FileUploadTest(AuthedTestCase):
|
||||
def test_multiple_upload_failure(self):
|
||||
"""
|
||||
Attempting to upload two files should fail.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
fp = StringIO("bah!")
|
||||
fp.name = "a.txt"
|
||||
fp2 = StringIO("pshaw!")
|
||||
fp2.name = "b.txt"
|
||||
|
||||
result = self.client.post("/json/upload_file", {'f1': fp, 'f2': fp2})
|
||||
self.assert_json_error(result, "You may only upload one file at a time")
|
||||
|
||||
def test_no_file_upload_failure(self):
|
||||
"""
|
||||
Calling this endpoint with no files should fail.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
|
||||
result = self.client.post("/json/upload_file")
|
||||
self.assert_json_error(result, "You must specify a file to upload")
|
||||
|
||||
class S3Test(AuthedTestCase):
|
||||
# full URIs in public bucket
|
||||
test_uris = [] # type: List[str]
|
||||
# keys in authed bucket
|
||||
test_keys = [] # type: List[str]
|
||||
|
||||
@slow(2.6, "has to contact external S3 service")
|
||||
@skip("Need S3 mock")
|
||||
def test_file_upload_authed(self):
|
||||
"""
|
||||
A call to /json/upload_file should return a uri and actually create an object.
|
||||
"""
|
||||
self.login("hamlet@zulip.com")
|
||||
fp = StringIO("zulip!")
|
||||
fp.name = "zulip.txt"
|
||||
|
||||
result = self.client.post("/json/upload_file", {'file': fp})
|
||||
self.assert_json_success(result)
|
||||
json = ujson.loads(result.content)
|
||||
self.assertIn("uri", json)
|
||||
uri = json["uri"]
|
||||
base = '/user_uploads/'
|
||||
self.assertEquals(base, uri[:len(base)])
|
||||
self.test_keys.append(uri[len(base):])
|
||||
|
||||
response = self.client.get(uri)
|
||||
redirect_url = response['Location']
|
||||
|
||||
self.assertEquals("zulip!", urllib.request.urlopen(redirect_url).read().strip())
|
||||
|
||||
def tearDown(self):
|
||||
# clean up
|
||||
return
|
||||
# TODO: un-deadden this code when we have proper S3 mocking.
|
||||
conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY)
|
||||
for uri in self.test_uris:
|
||||
key = Key(conn.get_bucket(settings.S3_BUCKET))
|
||||
key.name = urllib.parse.urlparse(uri).path[1:]
|
||||
key.delete()
|
||||
self.test_uris.remove(uri)
|
||||
|
||||
for path in self.test_keys:
|
||||
key = Key(conn.get_bucket(settings.S3_AUTH_UPLOADS_BUCKET))
|
||||
key.name = path
|
||||
key.delete()
|
||||
self.test_keys.remove(path)
|
||||
|
||||
class SanitizeNameTests(TestCase):
|
||||
def test_file_name(self):
|
||||
self.assertEquals(sanitize_name(u'test.txt'), u'test.txt')
|
||||
self.assertEquals(sanitize_name(u'.hidden'), u'.hidden')
|
||||
self.assertEquals(sanitize_name(u'.hidden.txt'), u'.hidden.txt')
|
||||
self.assertEquals(sanitize_name(u'tarball.tar.gz'), u'tarball.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'.hidden_tarball.tar.gz'), u'.hidden_tarball.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'Testing{}*&*#().ta&&%$##&&r.gz'), u'Testing.tar.gz')
|
||||
self.assertEquals(sanitize_name(u'*testingfile?*.txt'), u'testingfile.txt')
|
||||
self.assertEquals(sanitize_name(u'snowman☃.txt'), u'snowman.txt')
|
||||
self.assertEquals(sanitize_name(u'테스트.txt'), u'테스트.txt')
|
||||
self.assertEquals(sanitize_name(u'~/."\`\?*"u0`000ssh/test.t**{}ar.gz'), u'.u0000sshtest.tar.gz')
|
||||
Reference in New Issue
Block a user