mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #17215: Avoid generating 47 leftover tmp dirs during a clean test run.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey
2011-11-13 19:05:02 +00:00
parent b8353016b7
commit 5de31cb8cb
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/formtools/tests/wizard/wizardtests/forms.py
View File

@@ -1,3 +1,4 @@
import os
import tempfile
from django import forms
@@ -10,7 +11,7 @@ from django.contrib.auth.models import User
from django.contrib.formtools.wizard.views import WizardView
temp_storage_location = tempfile.mkdtemp()
temp_storage_location = tempfile.mkdtemp(dir=os.environ.get('DJANGO_TEST_TEMP_DIR'))
temp_storage = FileSystemStorage(location=temp_storage_location)
class Page1(forms.Form):

3
tests/modeltests/model_forms/models.py
View File

@@ -7,13 +7,14 @@ and the examples are probably a poor fit for the ``ModelForm`` syntax. In other
words, most of these tests should be rewritten.
"""
import os
import tempfile
from django.core.files.storage import FileSystemStorage
from django.db import models
temp_storage_dir = tempfile.mkdtemp()
temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(temp_storage_dir)
ARTICLE_STATUS = (

2
tests/regressiontests/admin_views/admin.py
View File

@@ -260,7 +260,7 @@ class OldSubscriberAdmin(admin.ModelAdmin):
actions = None
temp_storage = FileSystemStorage(tempfile.mkdtemp())
temp_storage = FileSystemStorage(tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR']))
UPLOAD_TO = os.path.join(temp_storage.location, 'test_upload')

2
tests/regressiontests/admin_views/models.py
View File

@@ -246,7 +246,7 @@ class EmptyModel(models.Model):
return "Primary key = %s" % self.id
temp_storage = FileSystemStorage(tempfile.mkdtemp())
temp_storage = FileSystemStorage(tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR']))
UPLOAD_TO = os.path.join(temp_storage.location, 'test_upload')

3
tests/regressiontests/forms/models.py
View File

@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import os
import datetime
import tempfile
@@ -6,7 +7,7 @@ from django.core.files.storage import FileSystemStorage
from django.db import models
temp_storage_location = tempfile.mkdtemp()
temp_storage_location = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(location=temp_storage_location)

2
tests/regressiontests/staticfiles_tests/tests.py
View File

@@ -100,7 +100,7 @@ class BaseCollectionTestCase(BaseStaticFilesTestCase):
def setUp(self):
super(BaseCollectionTestCase, self).setUp()
self.old_root = settings.STATIC_ROOT
settings.STATIC_ROOT = tempfile.mkdtemp()
settings.STATIC_ROOT = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
self.run_collectstatic()
# Use our own error handler that can handle .svn dirs on Windows
#self.addCleanup(shutil.rmtree, settings.STATIC_ROOT,

1
tests/runtests.py
View File

@@ -19,6 +19,7 @@ CONTRIB_DIR = os.path.dirname(contrib.__file__)
MODEL_TEST_DIR = os.path.join(RUNTESTS_DIR, MODEL_TESTS_DIR_NAME)
REGRESSION_TEST_DIR = os.path.join(RUNTESTS_DIR, REGRESSION_TESTS_DIR_NAME)
TEMP_DIR = tempfile.mkdtemp(prefix='django_')
os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR
REGRESSION_SUBDIRS_TO_SKIP = ['locale']