Commit 2bc77be1 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #17054 -- Ensured the test suite runs when gettext isn't available, after r16981. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 67565a53

tests/regressiontests/i18n/commands/tests.py

+5 −2
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ import os 
import re

from subprocess import Popen, PIPE



can_run_extraction_tests = False

can_run_compilation_tests = False



def find_command(cmd, path=None, pathext=None):

    if path is None:

        path = os.environ.get('PATH', []).split(os.pathsep)
@@ -36,8 +39,8 @@ if xgettext_cmd: 
    if match:

        xversion = (int(match.group('major')), int(match.group('minor')))

        if xversion >= (0, 15):

            from extraction import *

            can_run_extraction_tests = True

    del p



if find_command('msgfmt'):

    from compilation import *
 
    can_run_compilation_tests = True

tests/regressiontests/i18n/tests.py

+11 −2
Original line number Diff line number Diff line
@@ -22,11 +22,20 @@ from django.utils.translation import (ugettext, ugettext_lazy, activate, 
    get_language_info, get_language, get_language_from_request)





from .commands.tests import NoWrapExtractorTests, IgnoredExtractorTests, MessageCompilationTests, PoFileTests, BasicExtractorTests, JavascriptExtractorTests, CopyPluralFormsExtractorTests, SymlinkExtractorTests, ExtractorTests

from .commands.tests import can_run_extraction_tests, can_run_compilation_tests

if can_run_extraction_tests:

    from .commands.extraction import (ExtractorTests, BasicExtractorTests,

        JavascriptExtractorTests, IgnoredExtractorTests, SymlinkExtractorTests,

        CopyPluralFormsExtractorTests, NoWrapExtractorTests)

if can_run_compilation_tests:

    from .commands.compilation import MessageCompilationTests, PoFileTests

from .contenttypes.tests import ContentTypeTests

from .forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm

from .models import Company, TestModel

from .patterns.tests import URLRedirectWithoutTrailingSlashTests, URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase, URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests, URLPrefixTests, URLResponseTests, URLRedirectTests

from .patterns.tests import (URLRedirectWithoutTrailingSlashTests,

    URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase,

    URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests,

    URLPrefixTests, URLResponseTests, URLRedirectTests)

from .test_warnings import DeprecationWarningTests