Django

Code

Changeset 9227

Show
Ignore:
Timestamp:
10/10/08 17:14:24 (3 months ago)
Author:
jacob
Message:

[1.0.X] Yet more file storage testing cleanup for the sake of buildbots; this should be the last of it, I hope.


Backport of r9226 from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/releases/1.0.X

    • Property svnmerge-integrated changed from /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9211,9222,9224 to /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9211,9222,9224,9226

  • django/branches/releases/1.0.X/tests/modeltests/model_forms/models.py

    r8854 r9227  
    2020    from django.utils.itercompat import sorted 
    2121 
    22 temp_storage = FileSystemStorage(tempfile.gettempdir()) 
     22temp_storage_dir = tempfile.mkdtemp() 
     23temp_storage = FileSystemStorage(temp_storage_dir) 
    2324 
    2425ARTICLE_STATUS = ( 
    …… 
    12521253>>> core.parent 
    12531254<Inventory: Pear> 
     1255 
     1256# Clean up 
     1257>>> import shutil 
     1258>>> shutil.rmtree(temp_storage_dir) 
    12541259"""} 

  • django/branches/releases/1.0.X/tests/regressiontests/file_storage/models.py

    r8638 r9227  
    11import os 
    22import tempfile 
     3import shutil 
    34from django.db import models 
    45from django.core.files.storage import FileSystemStorage 
    56from django.core.files.base import ContentFile 
    67 
    7 temp_storage = FileSystemStorage(tempfile.gettempdir()) 
     8temp_storage_dir = tempfile.mkdtemp() 
     9temp_storage = FileSystemStorage(temp_storage_dir) 
    810 
    911# Test for correct behavior of width_field/height_field. 
    …… 
    6567>>> hasattr(p3.mugshot, '_file') 
    6668False 
     69 
     70>>> shutil.rmtree(temp_storage_dir) 
    6771"""} 
    6872     

  • django/branches/releases/1.0.X/tests/regressiontests/file_storage/tests.py

    r8640 r9227  
    8989import os 
    9090import time 
     91import shutil 
     92import tempfile 
    9193from unittest import TestCase 
    9294from django.conf import settings 
    9395from django.core.files.base import ContentFile 
    94 from models import temp_storage 
     96from django.core.files.storage import FileSystemStorage 
    9597try: 
    9698    import threading 
    …… 
    105107class FileSaveRaceConditionTest(TestCase): 
    106108    def setUp(self): 
     109        self.storage_dir = tempfile.mkdtemp() 
     110        self.storage = FileSystemStorage(self.storage_dir) 
    107111        self.thread = threading.Thread(target=self.save_file, args=['conflict']) 
    108112     
     113    def tearDown(self): 
     114        shutil.rmtree(self.storage_dir) 
     115     
    109116    def save_file(self, name): 
    110         name = temp_storage.save(name, SlowFile("Data")) 
     117        name = self.storage.save(name, SlowFile("Data")) 
    111118     
    112119    def test_race_condition(self): 
    …… 
    114121        name = self.save_file('conflict') 
    115122        self.thread.join() 
    116         self.assert_(temp_storage.exists('conflict')) 
    117         self.assert_(temp_storage.exists('conflict_')) 
    118         temp_storage.delete('conflict') 
    119         temp_storage.delete('conflict_') 
     123        self.assert_(self.storage.exists('conflict')) 
     124        self.assert_(self.storage.exists('conflict_')) 
     125        self.storage.delete('conflict') 
     126        self.storage.delete('conflict_') 
    120127 
    121128class FileStoragePermissions(TestCase): 
    …… 
    123130        self.old_perms = settings.FILE_UPLOAD_PERMISSIONS 
    124131        settings.FILE_UPLOAD_PERMISSIONS = 0666 
    125          
    126     def test_file_upload_permissions(self): 
    127         name = temp_storage.save("the_file", ContentFile("data")) 
    128         actual_mode = os.stat(temp_storage.path(name))[0] & 0777 
    129         self.assertEqual(actual_mode, 0666) 
    130          
     132        self.storage_dir = tempfile.mkdtemp() 
     133        self.storage = FileSystemStorage(self.storage_dir) 
     134 
    131135    def tearDown(self): 
    132136        settings.FILE_UPLOAD_PERMISSIONS = self.old_perms 
     137        shutil.rmtree(self.storage_dir) 
     138 
     139    def test_file_upload_permissions(self): 
     140        name = self.storage.save("the_file", ContentFile("data")) 
     141        actual_mode = os.stat(self.storage.path(name))[0] & 0777 
     142        self.assertEqual(actual_mode, 0666) 
     143