summaryrefslogtreecommitdiff
path: root/tests/staticfiles_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-14 19:47:07 -0500
committerTim Graham <timograham@gmail.com>2015-02-17 19:03:03 -0500
commit307c0f299a6c26f5231d3516df5b4edc54b36553 (patch)
tree3c80c8cb475846c0dff45188db1db111249df97f /tests/staticfiles_tests
parentfa66ea75326e669cd3d51fb926a4364b8ba08959 (diff)
Refs #24324 -- Fixed Python 2 test failures when path to Django source contains non-ASCII characters.
Diffstat (limited to 'tests/staticfiles_tests')
-rw-r--r--tests/staticfiles_tests/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
index e79d32dbf7..54ba60fdb0 100644
--- a/tests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -241,7 +241,7 @@ class TestFindStatic(CollectionTestCase, TestDefaults):
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]))
- searched_locations = ', '.join(lines[4:])
+ searched_locations = ', '.join(force_text(x) for x in lines[4:])
# AppDirectoriesFinder searched locations
self.assertIn(os.path.join('staticfiles_tests', 'apps', 'test', 'static'),
searched_locations)