p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Used call_command return value in staticfiles tests 

Refs #26190.
This commit is contained in:
Claude Paroz 2016-02-13 18:20:29 +01:00
parent b46c0ea6c8
commit 269b5f262c
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/staticfiles/management/commands/collectstatic.py
View File

@ -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):
"""

4
django/contrib/staticfiles/management/commands/findstatic.py
View File

@ -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)

25
tests/staticfiles_tests/test_management.py
View File

@ -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]))