Fixed #23700 -- Fixed non-deterministic static files test failures on…

… Windows. This partially reverts commit 949ee52 refs #21230.
django · Jan 1, 2015 · b9feec9 · b9feec9
1 parent 40a8504
commit b9feec9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tests/staticfiles_tests/project/site_media/static/testfile.txt b/tests/staticfiles_tests/project/site_media/static/testfile.txt
@@ -0,0 +1 @@
+Test!
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
@@ -6,6 +6,7 @@
 import posixpath
 import shutil
 import sys
+import tempfile
 import unittest
 
 from django.template import Context, Template
@@ -129,13 +130,17 @@ class BaseCollectionTestCase(BaseStaticFilesTestCase):
     """
     def setUp(self):
         super(BaseCollectionTestCase, self).setUp()
-        if not os.path.exists(settings.STATIC_ROOT):
-            os.mkdir(settings.STATIC_ROOT)
+        self.old_root = settings.STATIC_ROOT
+        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,
                         ignore_errors=True, onerror=rmtree_errorhandler)
 
+    def tearDown(self):
+        settings.STATIC_ROOT = self.old_root
+        super(BaseCollectionTestCase, self).tearDown()
+
     def run_collectstatic(self, **kwargs):
         call_command('collectstatic', interactive=False, verbosity=0,
                      ignore_patterns=['*.ignoreme'], **kwargs)