Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refs #17215: Avoid generating 47 leftover tmp dirs during a clean tes…

…t run.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5de31cb8cb83c33d932d5ddf76ff81506c28bdff 1 parent b835301
Karen Tracey kmtracey authored
3  django/contrib/formtools/tests/wizard/wizardtests/forms.py
View
@@ -1,3 +1,4 @@
+import os
import tempfile
from django import forms
@@ -10,7 +11,7 @@
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
@@ -7,13 +7,14 @@
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
@@ -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')
4 tests/regressiontests/admin_views/models.py
View
@@ -246,7 +246,7 @@ def __unicode__(self):
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')
@@ -547,4 +547,4 @@ class PrePopulatedPostLargeSlug(models.Model):
title = models.CharField(max_length=100)
published = models.BooleanField()
slug = models.SlugField(max_length=1000)
-
+
3  tests/regressiontests/forms/models.py
View
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+import os
import datetime
import tempfile
@@ -6,7 +7,7 @@
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
@@ -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
@@ -19,6 +19,7 @@
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']
Please sign in to comment.
Something went wrong with that request. Please try again.