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/admin_scripts/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/admin_scripts/tests.py')
| -rw-r--r-- | tests/admin_scripts/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 9905630870..90f6cc077f 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -36,7 +36,7 @@ if not os.path.exists(test_dir): os.mkdir(test_dir) open(os.path.join(test_dir, '__init__.py'), 'w').close() -custom_templates_dir = os.path.join(os.path.dirname(__file__), 'custom_templates') +custom_templates_dir = os.path.join(os.path.dirname(upath(__file__)), 'custom_templates') SYSTEM_CHECK_MSG = 'System check identified no issues' @@ -117,7 +117,7 @@ class AdminScriptTestCase(unittest.TestCase): def run_test(self, script, args, settings_file=None, apps=None): base_dir = os.path.dirname(test_dir) # The base dir for Django's tests is one level up. - tests_dir = os.path.dirname(os.path.dirname(__file__)) + tests_dir = os.path.dirname(os.path.dirname(upath(__file__))) # The base dir for Django is one level above the test dir. We don't use # `import django` to figure that out, so we don't pick up a Django # from site-packages or similar. |