openstack/deb-python-django-compressor
Code Issues Proposed changes

Switch remaining tests to use override_settings. Fixes #669

Browse Source
This commit is contained in:
Johannes Linke
2015-12-25 15:47:51 +01:00
parent 73db52cf4a
commit 6bbd857342
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compressor/tests/test_base.py
View File

@@ -89,12 +89,14 @@ class PrecompilerAndAbsoluteFilterTestCase(SimpleTestCase):
self.helper(enabled=True, use_precompiler=True, use_absolute_filter=True, expected_output=self.css_absolutized) self.helper(enabled=True, use_precompiler=True, use_absolute_filter=True, expected_output=self.css_absolutized)
@override_settings(
COMPRESS_ENABLED=True,
COMPRESS_PRECOMPILERS=(),
COMPRESS_DEBUG_TOGGLE='nocompress',
)
class CompressorTestCase(SimpleTestCase): class CompressorTestCase(SimpleTestCase):
def setUp(self): def setUp(self):
settings.COMPRESS_ENABLED = True
settings.COMPRESS_PRECOMPILERS = ()
settings.COMPRESS_DEBUG_TOGGLE = 'nocompress'
self.css = """\ self.css = """\
<link rel="stylesheet" href="/static/css/one.css" type="text/css" /> <link rel="stylesheet" href="/static/css/one.css" type="text/css" />
<style type="text/css">p { border:5px solid green;}</style> <style type="text/css">p { border:5px solid green;}</style>
@@ -315,11 +317,9 @@ class CssMediaTestCase(SimpleTestCase):
[l.get('media', None) for l in output]) [l.get('media', None) for l in output])
@override_settings(COMPRESS_VERBOSE=True)
class VerboseTestCase(CompressorTestCase): class VerboseTestCase(CompressorTestCase):
pass
def setUp(self):
super(VerboseTestCase, self).setUp()
settings.COMPRESS_VERBOSE = True
class CacheBackendTestCase(CompressorTestCase): class CacheBackendTestCase(CompressorTestCase):

7
compressor/tests/test_filters.py
View File

@@ -191,8 +191,9 @@ class CssAbsolutizingTestCase(TestCase):
"p { filter: Alpha(src='%(url)simg/python.png%(query)s%(hash)s%(frag)s') }") "p { filter: Alpha(src='%(url)simg/python.png%(query)s%(hash)s%(frag)s') }")
def setUp(self): def setUp(self):
self.old_hashing_method = settings.COMPRESS_CSS_HASHING_METHOD self.override_settings = self.settings(COMPRESS_CSS_HASHING_METHOD=self.hashing_method)
settings.COMPRESS_CSS_HASHING_METHOD = self.hashing_method self.override_settings.__enter__()
self.css = """ self.css = """
<link rel="stylesheet" href="/static/css/url/url1.css" type="text/css"> <link rel="stylesheet" href="/static/css/url/url1.css" type="text/css">
<link rel="stylesheet" href="/static/css/url/2/url2.css" type="text/css"> <link rel="stylesheet" href="/static/css/url/2/url2.css" type="text/css">
@@ -200,7 +201,7 @@ class CssAbsolutizingTestCase(TestCase):
self.css_node = CssCompressor(self.css) self.css_node = CssCompressor(self.css)
def tearDown(self): def tearDown(self):
settings.COMPRESS_CSS_HASHING_METHOD = self.old_hashing_method self.override_settings.__exit__(None, None, None)
@override_settings(COMPRESS_CSS_HASHING_METHOD=None) @override_settings(COMPRESS_CSS_HASHING_METHOD=None)
def test_css_no_hash(self): def test_css_no_hash(self):

6
compressor/tests/test_parsers.py
View File

@@ -21,12 +21,12 @@ from compressor.tests.test_base import CompressorTestCase
class ParserTestCase(object): class ParserTestCase(object):
def setUp(self): def setUp(self):
self.old_parser = settings.COMPRESS_PARSER self.override_settings = self.settings(COMPRESS_PARSER=self.parser_cls)
settings.COMPRESS_PARSER = self.parser_cls self.override_settings.__enter__()
super(ParserTestCase, self).setUp() super(ParserTestCase, self).setUp()
def tearDown(self): def tearDown(self):
settings.COMPRESS_PARSER = self.old_parser self.override_settings.__exit__(None, None, None)
@unittest.skipIf(lxml is None, 'lxml not found') @unittest.skipIf(lxml is None, 'lxml not found')

21
compressor/tests/test_templatetags.py
View File

@@ -141,22 +141,23 @@ class TemplatetagTestCase(TestCase):
class PrecompilerTemplatetagTestCase(TestCase): class PrecompilerTemplatetagTestCase(TestCase):
def setUp(self): def setUp(self):
self.old_enabled = settings.COMPRESS_ENABLED
self.old_precompilers = settings.COMPRESS_PRECOMPILERS
precompiler = os.path.join(test_dir, 'precompiler.py') precompiler = os.path.join(test_dir, 'precompiler.py')
python = sys.executable python = sys.executable
settings.COMPRESS_ENABLED = True override_settings = {
settings.COMPRESS_PRECOMPILERS = ( 'COMPRESS_ENABLED': True,
('text/coffeescript', '%s %s' % (python, precompiler)), 'COMPRESS_PRECOMPILERS': (
('text/less', '%s %s' % (python, precompiler)), ('text/coffeescript', '%s %s' % (python, precompiler)),
) ('text/less', '%s %s' % (python, precompiler)),
)
}
self.override_settings = self.settings(**override_settings)
self.override_settings.__enter__()
self.context = {'STATIC_URL': settings.COMPRESS_URL} self.context = {'STATIC_URL': settings.COMPRESS_URL}
def tearDown(self): def tearDown(self):
settings.COMPRESS_ENABLED = self.old_enabled self.override_settings.__exit__(None, None, None)
settings.COMPRESS_PRECOMPILERS = self.old_precompilers
def test_compress_coffeescript_tag(self): def test_compress_coffeescript_tag(self):
template = """{% load compress %}{% compress js %} template = """{% load compress %}{% compress js %}