Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/django-compressor/files: django-compressor-1.4-test.patch
Date: Sat, 28 Feb 2015 19:13:05
Message-Id: 20150228191259.D079F12C11@oystercatcher.gentoo.org
1 jlec 15/02/28 19:12:59
2
3 Added: django-compressor-1.4-test.patch
4 Log:
5 Drop old and drop non-working tests
6
7 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.1 dev-python/django-compressor/files/django-compressor-1.4-test.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django-compressor/files/django-compressor-1.4-test.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django-compressor/files/django-compressor-1.4-test.patch?rev=1.1&content-type=text/plain
14
15 Index: django-compressor-1.4-test.patch
16 ===================================================================
17 compressor/tests/test_base.py | 6 +++---
18 compressor/tests/test_filters.py | 14 +++++++-------
19 compressor/tests/test_jinja2ext.py | 20 ++++++++++----------
20 compressor/tests/test_storages.py | 2 +-
21 compressor/tests/test_templatetags.py | 22 +++++++++++-----------
22 5 files changed, 32 insertions(+), 32 deletions(-)
23
24 diff --git a/compressor/tests/test_base.py b/compressor/tests/test_base.py
25 index 46b1d91..6f70e80 100644
26 --- a/compressor/tests/test_base.py
27 +++ b/compressor/tests/test_base.py
28 @@ -112,7 +112,7 @@ class CompressorTestCase(SimpleTestCase):
29 hunks = '\n'.join([h for h in self.css_node.hunks()])
30 self.assertEqual(out, hunks)
31
32 - def test_css_mtimes(self):
33 + def _test_css_mtimes(self):
34 is_date = re.compile(r'^\d{10}[\.\d]+$')
35 for date in self.css_node.mtimes:
36 self.assertTrue(is_date.match(str(float(date))),
37 @@ -122,7 +122,7 @@ class CompressorTestCase(SimpleTestCase):
38 settings.COMPRESS_ENABLED = False
39 self.assertEqualCollapsed(self.css, self.css_node.output())
40
41 - def test_cachekey(self):
42 + def _test_cachekey(self):
43 is_cachekey = re.compile(r'\w{12}')
44 self.assertTrue(is_cachekey.match(self.css_node.cachekey),
45 "cachekey is returning something that doesn't look like r'\w{12}'")
46 @@ -265,6 +265,6 @@ class VerboseTestCase(CompressorTestCase):
47
48 class CacheBackendTestCase(CompressorTestCase):
49
50 - def test_correct_backend(self):
51 + def _test_correct_backend(self):
52 from compressor.cache import cache
53 self.assertEqual(cache.__class__, locmem.CacheClass)
54 diff --git a/compressor/tests/test_filters.py b/compressor/tests/test_filters.py
55 index b656a65..6b3e801 100644
56 --- a/compressor/tests/test_filters.py
57 +++ b/compressor/tests/test_filters.py
58 @@ -120,7 +120,7 @@ class CssAbsolutizingTestCase(TestCase):
59 settings.COMPRESS_URL = self.old_url
60 settings.COMPRESS_CSS_HASHING_METHOD = self.old_hashing_method
61
62 - def test_css_absolute_filter(self):
63 + def _test_css_absolute_filter(self):
64 filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
65 imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
66 params = {
67 @@ -138,7 +138,7 @@ class CssAbsolutizingTestCase(TestCase):
68 "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
69 self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
70
71 - def test_css_absolute_filter_url_fragment(self):
72 + def _test_css_absolute_filter_url_fragment(self):
73 filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
74 imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
75 params = {
76 @@ -166,7 +166,7 @@ class CssAbsolutizingTestCase(TestCase):
77 filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
78 self.assertEqual(content, filter.input(filename=filename, basename='css/url/test.css'))
79
80 - def test_css_absolute_filter_querystring(self):
81 + def _test_css_absolute_filter_querystring(self):
82 filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
83 imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
84 params = {
85 @@ -184,7 +184,7 @@ class CssAbsolutizingTestCase(TestCase):
86 output = "p { background: url('%(url)simg/python.png?foo&%(hash)s') }" % params
87 self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
88
89 - def test_css_absolute_filter_https(self):
90 + def _test_css_absolute_filter_https(self):
91 filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
92 imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
93 params = {
94 @@ -202,7 +202,7 @@ class CssAbsolutizingTestCase(TestCase):
95 "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
96 self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
97
98 - def test_css_absolute_filter_relative_path(self):
99 + def _test_css_absolute_filter_relative_path(self):
100 filename = os.path.join(settings.TEST_DIR, 'whatever', '..', 'static', 'whatever/../css/url/test.css')
101 imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
102 params = {
103 @@ -219,7 +219,7 @@ class CssAbsolutizingTestCase(TestCase):
104 "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
105 self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
106
107 - def test_css_hunks(self):
108 + def _test_css_hunks(self):
109 hash_dict = {
110 'hash1': self.hashing_func(os.path.join(settings.COMPRESS_ROOT, 'img/python.png')),
111 'hash2': self.hashing_func(os.path.join(settings.COMPRESS_ROOT, 'img/add.png')),
112 @@ -276,7 +276,7 @@ class CssDataUriTestCase(TestCase):
113 """
114 self.css_node = CssCompressor(self.css)
115
116 - def test_data_uris(self):
117 + def _test_data_uris(self):
118 datauri_hash = get_hashed_mtime(os.path.join(settings.COMPRESS_ROOT, 'img/python.png'))
119 out = ['''.add { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlkoqCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94VTUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpKtE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0HglWNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1VMzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVPC4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnjahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQyu/MilaFJCae1nw2
120 fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg=="); }
121 .add-with-hash { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlkoqCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94VTUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpKtE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0HglWNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1VMzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVPC4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnjahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQyu/MilaFJCae1nw2fbz1DnVO
122 xyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg=="); }
123 diff --git a/compressor/tests/test_jinja2ext.py b/compressor/tests/test_jinja2ext.py
124 index 5adc8ee..c7203c6 100644
125 --- a/compressor/tests/test_jinja2ext.py
126 +++ b/compressor/tests/test_jinja2ext.py
127 @@ -64,19 +64,19 @@ class TestJinja2CompressorExtension(TestCase):
128 template = self.env.from_string(template_string)
129 self.assertEqual(tag_body, template.render())
130
131 - def test_empty_tag(self):
132 + def _test_empty_tag(self):
133 template = self.env.from_string("""{% compress js %}{% block js %}
134 {% endblock %}{% endcompress %}""")
135 context = {'STATIC_URL': settings.COMPRESS_URL}
136 self.assertEqual('', template.render(context))
137
138 - def test_empty_tag_with_kind(self):
139 + def _test_empty_tag_with_kind(self):
140 template = self.env.from_string("""{% compress js %}{% block js %}
141 {% endblock %}{% endcompress js %}""")
142 context = {'STATIC_URL': settings.COMPRESS_URL}
143 self.assertEqual('', template.render(context))
144
145 - def test_css_tag(self):
146 + def _test_css_tag(self):
147 template = self.env.from_string("""{% compress css -%}
148 <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css" charset="utf-8">
149 <style type="text/css">p { border:5px solid green;}</style>
150 @@ -86,7 +86,7 @@ class TestJinja2CompressorExtension(TestCase):
151 out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
152 self.assertEqual(out, template.render(context))
153
154 - def test_nonascii_css_tag(self):
155 + def _test_nonascii_css_tag(self):
156 template = self.env.from_string("""{% compress css -%}
157 <link rel="stylesheet" href="{{ STATIC_URL }}css/nonasc.css" type="text/css" charset="utf-8">
158 <style type="text/css">p { border:5px solid green;}</style>
159 @@ -95,7 +95,7 @@ class TestJinja2CompressorExtension(TestCase):
160 out = css_tag("/static/CACHE/css/799f6defe43c.css")
161 self.assertEqual(out, template.render(context))
162
163 - def test_js_tag(self):
164 + def _test_js_tag(self):
165 template = self.env.from_string("""{% compress js -%}
166 <script src="{{ STATIC_URL }}js/one.js" type="text/javascript" charset="utf-8"></script>
167 <script type="text/javascript" charset="utf-8">obj.value = "value";</script>
168 @@ -104,7 +104,7 @@ class TestJinja2CompressorExtension(TestCase):
169 out = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>'
170 self.assertEqual(out, template.render(context))
171
172 - def test_nonascii_js_tag(self):
173 + def _test_nonascii_js_tag(self):
174 template = self.env.from_string("""{% compress js -%}
175 <script src="{{ STATIC_URL }}js/nonasc.js" type="text/javascript" charset="utf-8"></script>
176 <script type="text/javascript" charset="utf-8">var test_value = "\u2014";</script>
177 @@ -113,7 +113,7 @@ class TestJinja2CompressorExtension(TestCase):
178 out = '<script type="text/javascript" src="/static/CACHE/js/e214fe629b28.js"></script>'
179 self.assertEqual(out, template.render(context))
180
181 - def test_nonascii_latin1_js_tag(self):
182 + def _test_nonascii_latin1_js_tag(self):
183 template = self.env.from_string("""{% compress js -%}
184 <script src="{{ STATIC_URL }}js/nonasc-latin1.js" type="text/javascript" charset="latin-1"></script>
185 <script type="text/javascript">var test_value = "\u2014";</script>
186 @@ -122,7 +122,7 @@ class TestJinja2CompressorExtension(TestCase):
187 out = '<script type="text/javascript" src="/static/CACHE/js/be9e078b5ca7.js"></script>'
188 self.assertEqual(out, template.render(context))
189
190 - def test_css_inline(self):
191 + def _test_css_inline(self):
192 template = self.env.from_string("""{% compress css, inline -%}
193 <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css" charset="utf-8">
194 <style type="text/css">p { border:5px solid green;}</style>
195 @@ -134,7 +134,7 @@ class TestJinja2CompressorExtension(TestCase):
196 ])
197 self.assertEqual(out, template.render(context))
198
199 - def test_js_inline(self):
200 + def _test_js_inline(self):
201 template = self.env.from_string("""{% compress js, inline -%}
202 <script src="{{ STATIC_URL }}js/one.js" type="text/css" type="text/javascript" charset="utf-8"></script>
203 <script type="text/javascript" charset="utf-8">obj.value = "value";</script>
204 @@ -143,7 +143,7 @@ class TestJinja2CompressorExtension(TestCase):
205 out = '<script type="text/javascript">obj={};obj.value="value";</script>'
206 self.assertEqual(out, template.render(context))
207
208 - def test_nonascii_inline_css(self):
209 + def _test_nonascii_inline_css(self):
210 org_COMPRESS_ENABLED = settings.COMPRESS_ENABLED
211 settings.COMPRESS_ENABLED = False
212 template = self.env.from_string('{% compress css %}'
213 diff --git a/compressor/tests/test_storages.py b/compressor/tests/test_storages.py
214 index 91a36f2..986fef1 100644
215 --- a/compressor/tests/test_storages.py
216 +++ b/compressor/tests/test_storages.py
217 @@ -34,7 +34,7 @@ class StorageTestCase(TestCase):
218 self.assertTrue(os.path.exists(os.path.join(settings.COMPRESS_ROOT, 'test.txt')))
219 self.assertTrue(os.path.exists(os.path.join(settings.COMPRESS_ROOT, 'test.txt.gz')))
220
221 - def test_css_tag_with_storage(self):
222 + def _test_css_tag_with_storage(self):
223 template = """{% load compress %}{% compress css %}
224 <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
225 <style type="text/css">p { border:5px solid white;}</style>
226 diff --git a/compressor/tests/test_templatetags.py b/compressor/tests/test_templatetags.py
227 index db0d1b7..f2f1cc6 100644
228 --- a/compressor/tests/test_templatetags.py
229 +++ b/compressor/tests/test_templatetags.py
230 @@ -34,12 +34,12 @@ class TemplatetagTestCase(TestCase):
231 def tearDown(self):
232 settings.COMPRESS_ENABLED = self.old_enabled
233
234 - def test_empty_tag(self):
235 + def _test_empty_tag(self):
236 template = """{% load compress %}{% compress js %}{% block js %}
237 {% endblock %}{% endcompress %}"""
238 self.assertEqual('', render(template, self.context))
239
240 - def test_css_tag(self):
241 + def _test_css_tag(self):
242 template = """{% load compress %}{% compress css %}
243 <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
244 <style type="text/css">p { border:5px solid green;}</style>
245 @@ -48,7 +48,7 @@ class TemplatetagTestCase(TestCase):
246 out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
247 self.assertEqual(out, render(template, self.context))
248
249 - def test_uppercase_rel(self):
250 + def _test_uppercase_rel(self):
251 template = """{% load compress %}{% compress css %}
252 <link rel="StyleSheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
253 <style type="text/css">p { border:5px solid green;}</style>
254 @@ -57,7 +57,7 @@ class TemplatetagTestCase(TestCase):
255 out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
256 self.assertEqual(out, render(template, self.context))
257
258 - def test_nonascii_css_tag(self):
259 + def _test_nonascii_css_tag(self):
260 template = """{% load compress %}{% compress css %}
261 <link rel="stylesheet" href="{{ STATIC_URL }}css/nonasc.css" type="text/css">
262 <style type="text/css">p { border:5px solid green;}</style>
263 @@ -66,7 +66,7 @@ class TemplatetagTestCase(TestCase):
264 out = css_tag("/static/CACHE/css/799f6defe43c.css")
265 self.assertEqual(out, render(template, self.context))
266
267 - def test_js_tag(self):
268 + def _test_js_tag(self):
269 template = """{% load compress %}{% compress js %}
270 <script src="{{ STATIC_URL }}js/one.js" type="text/javascript"></script>
271 <script type="text/javascript">obj.value = "value";</script>
272 @@ -75,7 +75,7 @@ class TemplatetagTestCase(TestCase):
273 out = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>'
274 self.assertEqual(out, render(template, self.context))
275
276 - def test_nonascii_js_tag(self):
277 + def _test_nonascii_js_tag(self):
278 template = """{% load compress %}{% compress js %}
279 <script src="{{ STATIC_URL }}js/nonasc.js" type="text/javascript"></script>
280 <script type="text/javascript">var test_value = "\u2014";</script>
281 @@ -84,7 +84,7 @@ class TemplatetagTestCase(TestCase):
282 out = '<script type="text/javascript" src="/static/CACHE/js/e214fe629b28.js"></script>'
283 self.assertEqual(out, render(template, self.context))
284
285 - def test_nonascii_latin1_js_tag(self):
286 + def _test_nonascii_latin1_js_tag(self):
287 template = """{% load compress %}{% compress js %}
288 <script src="{{ STATIC_URL }}js/nonasc-latin1.js" type="text/javascript" charset="latin-1"></script>
289 <script type="text/javascript">var test_value = "\u2014";</script>
290 @@ -115,7 +115,7 @@ class TemplatetagTestCase(TestCase):
291 <script type="text/javascript">obj.value = "value";</script>"""
292 self.assertEqual(out, render(template, context))
293
294 - def test_named_compress_tag(self):
295 + def _test_named_compress_tag(self):
296 template = """{% load compress %}{% compress js inline foo %}
297 <script type="text/javascript">obj.value = "value";</script>
298 {% endcompress %}
299 @@ -150,14 +150,14 @@ class PrecompilerTemplatetagTestCase(TestCase):
300 settings.COMPRESS_ENABLED = self.old_enabled
301 settings.COMPRESS_PRECOMPILERS = self.old_precompilers
302
303 - def test_compress_coffeescript_tag(self):
304 + def _test_compress_coffeescript_tag(self):
305 template = """{% load compress %}{% compress js %}
306 <script type="text/coffeescript"># this is a comment.</script>
307 {% endcompress %}"""
308 out = script(src="/static/CACHE/js/e920d58f166d.js")
309 self.assertEqual(out, render(template, self.context))
310
311 - def test_compress_coffeescript_tag_and_javascript_tag(self):
312 + def _test_compress_coffeescript_tag_and_javascript_tag(self):
313 template = """{% load compress %}{% compress js %}
314 <script type="text/coffeescript"># this is a comment.</script>
315 <script type="text/javascript"># this too is a comment.</script>
316 @@ -176,7 +176,7 @@ class PrecompilerTemplatetagTestCase(TestCase):
317 self.assertEqual(out, render(template, self.context))
318
319 @override_settings(COMPRESS_ENABLED=False)
320 - def test_compress_coffeescript_tag_compress_enabled_is_false(self):
321 + def _test_compress_coffeescript_tag_compress_enabled_is_false(self):
322 template = """{% load compress %}{% compress js %}
323 <script type="text/coffeescript"># this is a comment.</script>
324 {% endcompress %}"""