From 269b5f262cef88cb595b21a76e707b41ee4ed627 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 13 Feb 2016 18:20:29 +0100
Subject: [PATCH] Used call_command return value in staticfiles tests

Refs #26190.
---
 .../management/commands/collectstatic.py      |  2 +-
 .../management/commands/findstatic.py         |  4 +--
 tests/staticfiles_tests/test_management.py    | 25 ++++++-------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py
index 66dd782936d..4d6df282c3c 100644
--- a/django/contrib/staticfiles/management/commands/collectstatic.py
+++ b/django/contrib/staticfiles/management/commands/collectstatic.py
@@ -194,7 +194,7 @@ class Command(BaseCommand):
                                    ', %s post-processed'
                                    % post_processed_count or ''),
             }
-            self.stdout.write(summary)
+            return summary
 
     def log(self, msg, level=2):
         """
diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py
index 2152035dbb1..367242fd214 100644
--- a/django/contrib/staticfiles/management/commands/findstatic.py
+++ b/django/contrib/staticfiles/management/commands/findstatic.py
@@ -22,7 +22,7 @@ class Command(LabelCommand):
         result = finders.find(path, all=options['all'])
         path = force_text(path)
         if verbosity >= 2:
-            searched_locations = ("Looking in the following locations:\n  %s" %
+            searched_locations = ("\nLooking in the following locations:\n  %s" %
                                   "\n  ".join(force_text(location)
                                   for location in finders.searched_locations))
         else:
@@ -33,7 +33,7 @@ class Command(LabelCommand):
             result = (force_text(os.path.realpath(path)) for path in result)
             if verbosity >= 1:
                 file_list = '\n  '.join(result)
-                return ("Found '%s' here:\n  %s\n%s" %
+                return ("Found '%s' here:\n  %s%s" %
                         (path, file_list, searched_locations))
             else:
                 return '\n'.join(result)
diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py
index ed6749b217e..47009776667 100644
--- a/tests/staticfiles_tests/test_management.py
+++ b/tests/staticfiles_tests/test_management.py
@@ -39,21 +39,16 @@ class TestFindStatic(CollectionTestCase, TestDefaults):
     Test ``findstatic`` management command.
     """
     def _get_file(self, filepath):
-        out = six.StringIO()
-        call_command('findstatic', filepath, all=False, verbosity=0, stdout=out)
-        out.seek(0)
-        lines = [l.strip() for l in out.readlines()]
-        with codecs.open(force_text(lines[0].strip()), "r", "utf-8") as f:
+        path = call_command('findstatic', filepath, all=False, verbosity=0, stdout=six.StringIO())
+        with codecs.open(force_text(path), "r", "utf-8") as f:
             return f.read()
 
     def test_all_files(self):
         """
         Test that findstatic returns all candidate files if run without --first and -v1.
         """
-        out = six.StringIO()
-        call_command('findstatic', 'test/file.txt', verbosity=1, stdout=out)
-        out.seek(0)
-        lines = [l.strip() for l in out.readlines()]
+        result = call_command('findstatic', 'test/file.txt', verbosity=1, stdout=six.StringIO())
+        lines = [l.strip() for l in result.split('\n')]
         self.assertEqual(len(lines), 3)  # three because there is also the "Found <file> here" line
         self.assertIn('project', force_text(lines[1]))
         self.assertIn('apps', force_text(lines[2]))
@@ -62,10 +57,8 @@ class TestFindStatic(CollectionTestCase, TestDefaults):
         """
         Test that findstatic returns all candidate files if run without --first and -v0.
         """
-        out = six.StringIO()
-        call_command('findstatic', 'test/file.txt', verbosity=0, stdout=out)
-        out.seek(0)
-        lines = [l.strip() for l in out.readlines()]
+        result = call_command('findstatic', 'test/file.txt', verbosity=0, stdout=six.StringIO())
+        lines = [l.strip() for l in result.split('\n')]
         self.assertEqual(len(lines), 2)
         self.assertIn('project', force_text(lines[0]))
         self.assertIn('apps', force_text(lines[1]))
@@ -75,10 +68,8 @@ class TestFindStatic(CollectionTestCase, TestDefaults):
         Test that findstatic returns all candidate files if run without --first and -v2.
         Also, test that findstatic returns the searched locations with -v2.
         """
-        out = six.StringIO()
-        call_command('findstatic', 'test/file.txt', verbosity=2, stdout=out)
-        out.seek(0)
-        lines = [l.strip() for l in out.readlines()]
+        result = call_command('findstatic', 'test/file.txt', verbosity=2, stdout=six.StringIO())
+        lines = [l.strip() for l in result.split('\n')]
         self.assertIn('project', force_text(lines[1]))
         self.assertIn('apps', force_text(lines[2]))
         self.assertIn("Looking in the following locations:", force_text(lines[3]))