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/test_runner/tests.py | |
| 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/test_runner/tests.py')
| -rw-r--r-- | tests/test_runner/tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index d94d264321..f880d4a56c 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -18,6 +18,7 @@ from django.test import ( from django.test.runner import DiscoverRunner, dependency_ordered from django.test.testcases import connections_support_transactions from django.utils import six +from django.utils.encoding import force_text from .models import Person @@ -391,7 +392,7 @@ class DeprecationDisplayTest(AdminScriptTestCase): def test_runner_deprecation_verbosity_default(self): args = ['test', '--settings=test_project.settings', 'test_runner_deprecation_app'] out, err = self.run_django_admin(args) - self.assertIn("Ran 1 test", err) + self.assertIn("Ran 1 test", force_text(err)) six.assertRegex(self, err, r"RemovedInDjango\d\dWarning: warning from test") six.assertRegex(self, err, r"RemovedInDjango\d\dWarning: module-level warning from deprecation_app") |
