Author: aaugustin
Date: 2011-10-18 13:35:42 -0700 (Tue, 18 Oct 2011)
New Revision: 17013
Modified:
django/trunk/tests/regressiontests/i18n/commands/tests.py
django/trunk/tests/regressiontests/i18n/tests.py
Log:
Fixed #17054 -- Ensured the test suite runs when gettext isn't available, after
r16981.
Modified: django/trunk/tests/regressiontests/i18n/commands/tests.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/commands/tests.py 2011-10-18
20:28:52 UTC (rev 17012)
+++ django/trunk/tests/regressiontests/i18n/commands/tests.py 2011-10-18
20:35:42 UTC (rev 17013)
@@ -2,6 +2,9 @@
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 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
Modified: django/trunk/tests/regressiontests/i18n/tests.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/tests.py 2011-10-18 20:28:52 UTC
(rev 17012)
+++ django/trunk/tests/regressiontests/i18n/tests.py 2011-10-18 20:35:42 UTC
(rev 17013)
@@ -22,11 +22,20 @@
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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
