Commit 949ee521 authored by Huu Nguyen's avatar Huu Nguyen Committed by Tim Graham
Browse files

Refs #21230 -- removed direct settings manipulation from staticfile tests

parent e3a9714c

tests/staticfiles_tests/project/site_media/static/testfile.txt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
Test!
 
 No newline at end of file

tests/staticfiles_tests/tests.py

+3 −11
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ import os 
import posixpath

import shutil

import sys

import tempfile

import unittest



from django.template import loader, Context
@@ -121,17 +120,13 @@ class BaseCollectionTestCase(BaseStaticFilesTestCase): 
    """

    def setUp(self):

        super(BaseCollectionTestCase, self).setUp()

        self.old_root = settings.STATIC_ROOT

        settings.STATIC_ROOT = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])

        if not os.path.exists(settings.STATIC_ROOT):

            os.mkdir(settings.STATIC_ROOT)

        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)
@@ -754,14 +749,11 @@ class TestServeStatic(StaticFilesTestCase): 
        self.assertEqual(self._response(filepath).status_code, 404)





@override_settings(DEBUG=False)

class TestServeDisabled(TestServeStatic):

    """

    Test serving static files disabled when DEBUG is False.

    """

    def setUp(self):

        super(TestServeDisabled, self).setUp()

        settings.DEBUG = False



    def test_disabled_serving(self):

        self.assertFileNotFound('test.txt')