innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #23700 -- Fixed non-deterministic static files test failures on Windows. 

This partially reverts commit 949ee521fa
refs #21230.
This commit is contained in:
Tim Graham 2015-01-01 13:54:25 -05:00
parent 40a8504357
commit b9feec959b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/staticfiles_tests/project/site_media/static/testfile.txt Normal file
View File

@ -0,0 +1 @@
Test!

9
tests/staticfiles_tests/tests.py
View File

@ -6,6 +6,7 @@ import os
import posixpath import posixpath
import shutil import shutil
import sys import sys
import tempfile
import unittest import unittest
from django.template import Context, Template from django.template import Context, Template
@ -129,13 +130,17 @@ class BaseCollectionTestCase(BaseStaticFilesTestCase):
""" """
def setUp(self): def setUp(self):
super(BaseCollectionTestCase, self).setUp() super(BaseCollectionTestCase, self).setUp()
if not os.path.exists(settings.STATIC_ROOT): self.old_root = settings.STATIC_ROOT
os.mkdir(settings.STATIC_ROOT) settings.STATIC_ROOT = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
self.run_collectstatic() self.run_collectstatic()
# Use our own error handler that can handle .svn dirs on Windows # Use our own error handler that can handle .svn dirs on Windows
self.addCleanup(shutil.rmtree, settings.STATIC_ROOT, self.addCleanup(shutil.rmtree, settings.STATIC_ROOT,
ignore_errors=True, onerror=rmtree_errorhandler) ignore_errors=True, onerror=rmtree_errorhandler)
def tearDown(self):
settings.STATIC_ROOT = self.old_root
super(BaseCollectionTestCase, self).tearDown()
def run_collectstatic(self, **kwargs): def run_collectstatic(self, **kwargs):
call_command('collectstatic', interactive=False, verbosity=0, call_command('collectstatic', interactive=False, verbosity=0,
ignore_patterns=['*.ignoreme'], **kwargs) ignore_patterns=['*.ignoreme'], **kwargs)