Created import-time test temp dirs in known location

Refs #17215. In the same spirit as 5de31cb8cb.
This commit is contained in:
Claude Paroz 2014-06-23 14:51:53 +02:00
parent 1d9596025e
commit 809362518d
4 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,4 @@
import os
import tempfile
from django.core.files.storage import FileSystemStorage
@ -5,7 +6,7 @@ from django.db import models
from django.forms import ModelForm
temp_storage_dir = tempfile.mkdtemp()
temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(temp_storage_dir)

View File

@ -5,6 +5,7 @@
and where files should be stored.
"""
import os
import random
import tempfile
@ -12,7 +13,7 @@ from django.db import models
from django.core.files.storage import FileSystemStorage
temp_storage_location = tempfile.mkdtemp()
temp_storage_location = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(location=temp_storage_location)

View File

@ -23,7 +23,7 @@ from .models import FileModel
UNICODE_FILENAME = 'test-0123456789_中文_Orléans.jpg'
MEDIA_ROOT = sys_tempfile.mkdtemp()
MEDIA_ROOT = sys_tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
UPLOAD_TO = os.path.join(MEDIA_ROOT, 'test_upload')

View File

@ -194,7 +194,7 @@ if Image:
attr_class = TestImageFieldFile
# Set up a temp directory for file storage.
temp_storage_dir = tempfile.mkdtemp()
temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
temp_storage = FileSystemStorage(temp_storage_dir)
temp_upload_to_dir = os.path.join(temp_storage.location, 'tests')