From bc1435551c0cfaf4a22aff8216990b909005dba9 Mon Sep 17 00:00:00 2001 From: Arthur Silva Date: Sat, 9 Jun 2018 18:12:43 -0400 Subject: [PATCH] Fixed #29464 -- Silenced post-process messages in collectstatic's default verbosity. --- .../management/commands/collectstatic.py | 2 +- tests/staticfiles_tests/test_management.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py index 980a63fe1c..a07b5f3c9a 100644 --- a/django/contrib/staticfiles/management/commands/collectstatic.py +++ b/django/contrib/staticfiles/management/commands/collectstatic.py @@ -134,7 +134,7 @@ class Command(BaseCommand): 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) diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py index 74c7ef9fc6..3a6d536013 100644 --- a/tests/staticfiles_tests/test_management.py +++ b/tests/staticfiles_tests/test_management.py @@ -179,6 +179,7 @@ class TestCollection(TestDefaults, CollectionTestCase): 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 @@ class TestCollectionVerbosity(CollectionTestCase): 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): """