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

Fix #468: Loosen tests to account for extra newlines with libxml2-2.9.1

Browse Source
This commit is contained in:
Aron Griffis
2014-02-06 12:57:17 -05:00
parent 6d56a38818
commit 00a9c43c26
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
compressor/tests/test_base.py
View File

@@ -63,6 +63,14 @@ class CompressorTestCase(SimpleTestCase):
<script type="text/javascript">obj.value = "value";</script>""" <script type="text/javascript">obj.value = "value";</script>"""
self.js_node = JsCompressor(self.js) self.js_node = JsCompressor(self.js)
def assertEqualCollapsed(self, a, b):
"""
assertEqual with internal newlines collapsed to single, and
trailing whitespace removed.
"""
collapse = lambda x: re.sub(r'\n+', '\n', x).rstrip()
self.assertEqual(collapse(a), collapse(b))
def test_css_split(self): def test_css_split(self):
out = [ out = [
( (
@@ -84,7 +92,7 @@ class CompressorTestCase(SimpleTestCase):
), ),
] ]
split = self.css_node.split_contents() split = self.css_node.split_contents()
split = [(x[0], x[1], x[2], self.css_node.parser.elem_str(x[3])) for x in split] split = [(x[0], x[1], x[2], self.css_node.parser.elem_str(x[3]).rstrip()) for x in split]
self.assertEqual(out, split) self.assertEqual(out, split)
def test_css_hunks(self): def test_css_hunks(self):
@@ -104,7 +112,7 @@ class CompressorTestCase(SimpleTestCase):
def test_css_return_if_off(self): def test_css_return_if_off(self):
settings.COMPRESS_ENABLED = False settings.COMPRESS_ENABLED = False
self.assertEqual(self.css, self.css_node.output()) self.assertEqualCollapsed(self.css, self.css_node.output())
def test_cachekey(self): def test_cachekey(self):
is_cachekey = re.compile(r'\w{12}') is_cachekey = re.compile(r'\w{12}')
@@ -131,7 +139,7 @@ class CompressorTestCase(SimpleTestCase):
), ),
] ]
split = self.js_node.split_contents() split = self.js_node.split_contents()
split = [(x[0], x[1], x[2], self.js_node.parser.elem_str(x[3])) for x in split] split = [(x[0], x[1], x[2], self.js_node.parser.elem_str(x[3]).rstrip()) for x in split]
self.assertEqual(out, split) self.assertEqual(out, split)
def test_js_hunks(self): def test_js_hunks(self):
@@ -154,7 +162,7 @@ class CompressorTestCase(SimpleTestCase):
@override_settings(COMPRESS_PRECOMPILERS=(), COMPRESS_ENABLED=False) @override_settings(COMPRESS_PRECOMPILERS=(), COMPRESS_ENABLED=False)
def test_js_return_if_off(self): def test_js_return_if_off(self):
self.assertEqual(self.js, self.js_node.output()) self.assertEqualCollapsed(self.js, self.js_node.output())
def test_js_return_if_on(self): def test_js_return_if_on(self):
output = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>' output = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>'