summaryrefslogtreecommitdiff
path: root/tests/file_uploads
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2019-02-09 15:03:36 -0800
committerTim Graham <timograham@gmail.com>2019-02-09 18:44:28 -0500
commita98bcfb0dd641a4a3ce3ec1acba55f804ade7bad (patch)
treea5ba37546d1280cb294519e6d2e6415e6e219fd5 /tests/file_uploads
parent56b50cbf73ecfd4577bb7cfe8dc8ccd4befd7e00 (diff)
downloaddjango-a98bcfb0dd641a4a3ce3ec1acba55f804ade7bad.tar.gz
Refs #15362 -- Removed obsolete workaround in file_uploads test view.
Diffstat (limited to 'tests/file_uploads')
-rw-r--r--tests/file_uploads/views.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/tests/file_uploads/views.py b/tests/file_uploads/views.py
index 1d1e745b71..36c9fc12a2 100644
--- a/tests/file_uploads/views.py
+++ b/tests/file_uploads/views.py
@@ -54,32 +54,15 @@ def file_upload_view_verify(request):
def file_upload_unicode_name(request):
-
# Check to see if unicode name came through properly.
if not request.FILES['file_unicode'].name.endswith(UNICODE_FILENAME):
return HttpResponseServerError()
-
- response = None
-
# Check to make sure the exotic characters are preserved even
# through file save.
uni_named_file = request.FILES['file_unicode']
- obj = FileModel.objects.create(testfile=uni_named_file)
+ FileModel.objects.create(testfile=uni_named_file)
full_name = '%s/%s' % (UPLOAD_TO, uni_named_file.name)
- if not os.path.exists(full_name):
- response = HttpResponseServerError()
-
- # Cleanup the object with its exotic file name immediately.
- # (shutil.rmtree used elsewhere in the tests to clean up the
- # upload directory has been seen to choke on unicode
- # filenames on Windows.)
- obj.delete()
- os.unlink(full_name)
-
- if response:
- return response
- else:
- return HttpResponse()
+ return HttpResponse() if os.path.exists(full_name) else HttpResponseServerError()
def file_upload_echo(request):