Skip to content

Commit

Permalink
[1.0.X] Be nice to buildbots: switched modeltests/files to use a pr…
Browse files Browse the repository at this point in the history
…oper isolated directory for file storage

Backport of r9222 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jacobian committed Oct 10, 2008
1 parent 194de93 commit a47f324
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions tests/modeltests/files/models.py
Expand Up @@ -5,14 +5,15 @@
and where files should be stored.
"""

import shutil
import tempfile

from django.db import models
from django.core.files.base import ContentFile
from django.core.files.storage import FileSystemStorage
from django.core.cache import cache

temp_storage = FileSystemStorage(location=tempfile.gettempdir())
temp_storage_location = tempfile.mkdtemp()
temp_storage = FileSystemStorage(location=temp_storage_location)

# Write out a file to be used as default content
temp_storage.save('tests/default.txt', ContentFile('default content'))
Expand Down Expand Up @@ -109,10 +110,10 @@ def random_upload_to(self, filename):
>>> obj4.random
<FieldFile: .../random_file>
# Clean up the temporary files.
# Clean up the temporary files and dir.
>>> obj1.normal.delete()
>>> obj2.normal.delete()
>>> obj3.default.delete()
>>> obj4.random.delete()
>>> shutil.rmtree(temp_storage_location)
"""}

0 comments on commit a47f324

Please sign in to comment.