From a47f32449a5e93c16665926e7d3fba2c45d5a06f Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Fri, 10 Oct 2008 20:14:52 +0000 Subject: [PATCH] [1.0.X] Be nice to buildbots: switched `modeltests/files` to use a proper 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 --- tests/modeltests/files/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/modeltests/files/models.py b/tests/modeltests/files/models.py index c9cfc357c3c24..3df3122cdb57f 100644 --- a/tests/modeltests/files/models.py +++ b/tests/modeltests/files/models.py @@ -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')) @@ -109,10 +110,10 @@ def random_upload_to(self, filename): >>> obj4.random -# 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) """}