diff options
| author | Tushar Bhatia <tushar747@gmail.com> | 2014-07-26 09:23:01 +0800 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-07-26 21:10:03 -0400 |
| commit | df0d5ea7bc9821923c70e7bf06d3646598cf019d (patch) | |
| tree | 88fe0569b34b169e09454095b31bb082923549e0 /tests/bug639 | |
| parent | 30ccb36cb9c1bc9bd30edb2b67f26ef2a1e4fb53 (diff) | |
[1.7.x] Fixed #22979 -- Moved bug* tests
Backport of 11181a64f from master.
Diffstat (limited to 'tests/bug639')
| -rw-r--r-- | tests/bug639/__init__.py | 0 | ||||
| -rw-r--r-- | tests/bug639/models.py | 31 | ||||
| -rw-r--r-- | tests/bug639/test.jpg | bin | 1780 -> 0 bytes | |||
| -rw-r--r-- | tests/bug639/tests.py | 45 |
4 files changed, 0 insertions, 76 deletions
diff --git a/tests/bug639/__init__.py b/tests/bug639/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/bug639/__init__.py +++ /dev/null diff --git a/tests/bug639/models.py b/tests/bug639/models.py deleted file mode 100644 index db34532025..0000000000 --- a/tests/bug639/models.py +++ /dev/null @@ -1,31 +0,0 @@ -import os -import tempfile - -from django.core.files.storage import FileSystemStorage -from django.db import models -from django.forms import ModelForm - - -temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR']) -temp_storage = FileSystemStorage(temp_storage_dir) - - -class Photo(models.Model): - title = models.CharField(max_length=30) - image = models.FileField(storage=temp_storage, upload_to='tests') - - # Support code for the tests; this keeps track of how many times save() - # gets called on each instance. - def __init__(self, *args, **kwargs): - super(Photo, self).__init__(*args, **kwargs) - self._savecount = 0 - - def save(self, force_insert=False, force_update=False): - super(Photo, self).save(force_insert, force_update) - self._savecount += 1 - - -class PhotoForm(ModelForm): - class Meta: - model = Photo - fields = '__all__' diff --git a/tests/bug639/test.jpg b/tests/bug639/test.jpg Binary files differdeleted file mode 100644 index 391b57a0f3..0000000000 --- a/tests/bug639/test.jpg +++ /dev/null diff --git a/tests/bug639/tests.py b/tests/bug639/tests.py deleted file mode 100644 index 26e172ab50..0000000000 --- a/tests/bug639/tests.py +++ /dev/null @@ -1,45 +0,0 @@ -""" -Tests for file field behavior, and specifically #639, in which Model.save() -gets called *again* for each FileField. This test will fail if calling a -ModelForm's save() method causes Model.save() to be called more than once. -""" - -import os -import shutil -import unittest - -from django.core.files.uploadedfile import SimpleUploadedFile -from django.utils._os import upath - -from .models import Photo, PhotoForm, temp_storage_dir - - -class Bug639Test(unittest.TestCase): - - def test_bug_639(self): - """ - Simulate a file upload and check how many times Model.save() gets - called. - """ - # Grab an image for testing. - filename = os.path.join(os.path.dirname(upath(__file__)), "test.jpg") - with open(filename, "rb") as fp: - img = fp.read() - - # Fake a POST QueryDict and FILES MultiValueDict. - data = {'title': 'Testing'} - files = {"image": SimpleUploadedFile('test.jpg', img, 'image/jpeg')} - - form = PhotoForm(data=data, files=files) - p = form.save() - - # Check the savecount stored on the object (see the model). - self.assertEqual(p._savecount, 1) - - def tearDown(self): - """ - Make sure to delete the "uploaded" file to avoid clogging /tmp. - """ - p = Photo.objects.get() - p.image.delete(save=False) - shutil.rmtree(temp_storage_dir) |
