Fixed #8244: Modified the temporary directory used by file storage tests so that mutliple test runs can be performed in parallel without conflict.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
6eb0dea21c
commit
06ea872b20
|
@ -5,7 +5,12 @@ Tests for the file storage mechanism
|
||||||
>>> from django.core.files.storage import FileSystemStorage
|
>>> from django.core.files.storage import FileSystemStorage
|
||||||
>>> from django.core.files.base import ContentFile
|
>>> from django.core.files.base import ContentFile
|
||||||
|
|
||||||
>>> temp_storage = FileSystemStorage(location=tempfile.gettempdir())
|
# Set up a unique temporary directory
|
||||||
|
>>> import os
|
||||||
|
>>> temp_dir = tempfile.mktemp()
|
||||||
|
>>> os.makedirs(temp_dir)
|
||||||
|
|
||||||
|
>>> temp_storage = FileSystemStorage(location=temp_dir)
|
||||||
|
|
||||||
# Standard file access options are available, and work as expected.
|
# Standard file access options are available, and work as expected.
|
||||||
|
|
||||||
|
@ -52,7 +57,7 @@ SuspiciousOperation: Attempted access to '/etc/passwd' denied.
|
||||||
... number += 1
|
... number += 1
|
||||||
...
|
...
|
||||||
... return name
|
... return name
|
||||||
>>> custom_storage = CustomStorage(tempfile.gettempdir())
|
>>> custom_storage = CustomStorage(temp_dir)
|
||||||
|
|
||||||
>>> first = custom_storage.save('custom_storage', ContentFile('custom contents'))
|
>>> first = custom_storage.save('custom_storage', ContentFile('custom contents'))
|
||||||
>>> first
|
>>> first
|
||||||
|
@ -63,6 +68,10 @@ u'custom_storage.2'
|
||||||
|
|
||||||
>>> custom_storage.delete(first)
|
>>> custom_storage.delete(first)
|
||||||
>>> custom_storage.delete(second)
|
>>> custom_storage.delete(second)
|
||||||
|
|
||||||
|
# Cleanup the temp dir
|
||||||
|
>>> os.rmdir(temp_dir)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Tests for a race condition on file saving (#4948).
|
# Tests for a race condition on file saving (#4948).
|
||||||
|
|
Loading…
Reference in New Issue