From 0d54e5b2e7b2ae81c3c96d466a03c2381c7d241f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 16 Jun 2015 14:54:45 +0100 Subject: [PATCH] Don't hard code image file size in test --- wagtail/wagtailimages/tests/test_admin_views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailimages/tests/test_admin_views.py b/wagtail/wagtailimages/tests/test_admin_views.py index 7c7809ebe1..8a4b954bb8 100644 --- a/wagtail/wagtailimages/tests/test_admin_views.py +++ b/wagtail/wagtailimages/tests/test_admin_views.py @@ -7,6 +7,7 @@ from django.utils.http import urlquote from django.core.urlresolvers import reverse from django.contrib.auth.models import Permission from django.core.files.uploadedfile import SimpleUploadedFile +from django.template.defaultfilters import filesizeformat # Get the chars that Django considers safe to leave unescaped in a URL # This list changed in Django 1.8: https://github.com/django/django/commit/e167e96cfea670422ca75d0b35fe7c4195f25b63 @@ -99,9 +100,11 @@ class TestImageAddView(TestCase, WagtailTestUtils): @override_settings(WAGTAILIMAGES_MAX_UPLOAD_SIZE=1) def test_add_too_large_file(self): + file_content = get_test_image_file().file.getvalue() + response = self.post({ 'title': "Test image", - 'file': SimpleUploadedFile('test.png', get_test_image_file().file.getvalue()), + 'file': SimpleUploadedFile('test.png', file_content), }) # Shouldn't redirect anywhere @@ -109,8 +112,10 @@ class TestImageAddView(TestCase, WagtailTestUtils): self.assertTemplateUsed(response, 'wagtailimages/images/add.html') # The form should have an error - # Note: \xa0 = non-blocking space - self.assertFormError(response, 'form', 'file', "This file is too big (1.9\xa0KB). Maximum filesize 1\xa0byte.") + self.assertFormError(response, 'form', 'file', "This file is too big ({file_size}). Maximum filesize {max_file_size}.".format( + file_size=filesizeformat(len(file_content)), + max_file_size=filesizeformat(1), + )) class TestImageEditView(TestCase, WagtailTestUtils):