Permalink
Browse files

Fixed #29464 -- Silenced post-process messages in collectstatic's def…

…ault verbosity.
  • Loading branch information...
arthurspa authored and timgraham committed Jun 9, 2018
1 parent 860903b commit bc1435551c0cfaf4a22aff8216990b909005dba9
@@ -134,7 +134,7 @@ def collect(self):
raise processed
if processed:
self.log("Post-processed '%s' as '%s'" %
- (original_path, processed_path), level=1)
+ (original_path, processed_path), level=2)
self.post_processed_files.append(original_path)
else:
self.log("Skipped post-processing '%s'" % original_path)
@@ -179,6 +179,7 @@ def test_common_ignore_patterns(self):
class TestCollectionVerbosity(CollectionTestCase):
copying_msg = 'Copying '
run_collectstatic_in_setUp = False
+ post_process_msg = 'Post-processed'
staticfiles_copied_msg = 'static files copied to'
def test_verbosity_0(self):
@@ -200,6 +201,18 @@ def test_verbosity_2(self):
self.assertIn(self.staticfiles_copied_msg, output)
self.assertIn(self.copying_msg, output)
+ @override_settings(STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage')
+ def test_verbosity_1_with_post_process(self):
+ stdout = StringIO()
+ self.run_collectstatic(verbosity=1, stdout=stdout, post_process=True)
+ self.assertNotIn(self.post_process_msg, stdout.getvalue())
+
+ @override_settings(STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage')
+ def test_verbosity_2_with_post_process(self):
+ stdout = StringIO()
+ self.run_collectstatic(verbosity=2, stdout=stdout, post_process=True)
+ self.assertIn(self.post_process_msg, stdout.getvalue())
+
class TestCollectionClear(CollectionTestCase):
"""

0 comments on commit bc14355

Please sign in to comment.