[1.8.x] Refs #24324 -- Skipped fixtures_regress tests that fail on Python 2 on a non-ASCII path.
Backport of b8d6cdbcc9
from master
This commit is contained in:
parent
1153bccc1b
commit
5068a51d88
|
@ -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):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue