diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-14 19:47:07 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-17 19:05:31 -0500 |
| commit | 2aa06e439a29a1c24fa03744395cc57787e7198e (patch) | |
| tree | 81b1a3e9bd7ef374521fc46be17d15e1f50a37c5 /tests/staticfiles_tests | |
| parent | 09da1b465ea8ba9ecb99b1cd02a689bb831d0e1b (diff) | |
[1.8.x] Refs #24324 -- Fixed Python 2 test failures when path to Django source contains non-ASCII characters.
Backport of 307c0f299a6c26f5231d3516df5b4edc54b36553 from master
Diffstat (limited to 'tests/staticfiles_tests')
| -rw-r--r-- | tests/staticfiles_tests/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py index 4ab72ad1ce..e4b04b5228 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) |