diff options
author | Tim Graham <timograham@gmail.com> | 2015-02-16 09:30:05 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-02-18 07:25:36 -0500 |
commit | b8d6cdbcc90ff8af781d13131b79ce88a9eff66d (patch) | |
tree | 7d1119eb355577e1136ddcf69aa0dcb311af2121 /tests/fixtures_regress | |
parent | 098fa12dd390e733c7568d824eea2c346550c75a (diff) | |
download | django-b8d6cdbcc90ff8af781d13131b79ce88a9eff66d.tar.gz |
Refs #24324 -- Skipped fixtures_regress tests that fail on Python 2 on a non-ASCII path.
Diffstat (limited to 'tests/fixtures_regress')
-rw-r--r-- | tests/fixtures_regress/tests.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py index 63dbe9e72b..e533be3bb6 100644 --- a/tests/fixtures_regress/tests.py +++ b/tests/fixtures_regress/tests.py @@ -5,8 +5,10 @@ from __future__ import unicode_literals import json import os import re +import unittest import warnings +import django from django.core import management, serializers from django.core.exceptions import ImproperlyConfigured from django.core.management.base import CommandError @@ -34,6 +36,16 @@ from .models import ( _cur_dir = os.path.dirname(os.path.abspath(upath(__file__))) +def is_ascii(s): + return all(ord(c) < 128 for c in s) + + +skipIfNonASCIIPath = unittest.skipIf( + not is_ascii(django.__file__) and six.PY2, + 'Python 2 crashes when checking non-ASCII exception messages.' +) + + class TestFixtures(TestCase): def animal_pre_save_check(self, signal, sender, instance, **kwargs): @@ -198,6 +210,7 @@ class TestFixtures(TestCase): verbosity=0, ) + @skipIfNonASCIIPath @override_settings(SERIALIZATION_MODULES={'unkn': 'unexistent.path'}) def test_unimportable_serializer(self): """ @@ -514,6 +527,7 @@ class TestFixtures(TestCase): verbosity=0, ) + @skipIfNonASCIIPath @override_settings(FIXTURE_DIRS=[os.path.join(_cur_dir, 'fixtures')]) def test_fixture_dirs_with_default_fixture_path(self): """ |