Commit 5de31cb8 authored by Karen Tracey's avatar Karen Tracey
Browse files

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b8353016

django/contrib/formtools/tests/wizard/wizardtests/forms.py

+2 −1
Original line number Diff line number Diff line 
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):

tests/modeltests/model_forms/models.py

+2 −1
Original line number Diff line number Diff line
@@ -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 = (

tests/regressiontests/admin_views/admin.py

+1 −1
Original line number Diff line number Diff line
@@ -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')

tests/regressiontests/admin_views/models.py

+2 −2
Original line number Diff line number Diff line
@@ -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')

tests/regressiontests/forms/models.py

+2 −1
Original line number Diff line number Diff line 
# -*- 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)