From fb614ff4a712cf7d221ed9ddeb7e4164e882ba81 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 16 Jan 2015 10:31:49 -0500 Subject: [PATCH] [1.6.x] Fixed #23312 -- Marked an i18n test as expectedFailure on Windows/Python 3. Backport of 433e7dd5076e492290a90130c9b3e2b1319b2f95 from stable/1.7.x --- tests/i18n/commands/extraction.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/i18n/commands/extraction.py b/tests/i18n/commands/extraction.py index e0b6debc70..18f537d478 100644 --- a/tests/i18n/commands/extraction.py +++ b/tests/i18n/commands/extraction.py @@ -5,6 +5,7 @@ import io import os import re import shutil +import sys import warnings from django.core import management @@ -14,7 +15,7 @@ from django.utils._os import upath from django.utils import six from django.utils.six import StringIO from django.utils.translation import TranslatorCommentWarning -from django.utils.unittest import SkipTest +from django.utils.unittest import expectedFailure, SkipTest LOCALE='de' @@ -141,6 +142,10 @@ class BasicExtractorTests(ExtractorTests): self.assertIn("UnicodeDecodeError: skipped file not_utf8.txt in .", force_text(stdout.getvalue())) + # This issue is fixed in 1.8+ (#23312). + if six.PY3 and sys.platform.startswith('win'): + test_unicode_decode_error = expectedFailure(test_unicode_decode_error) + def test_extraction_warning(self): """test xgettext warning about multiple bare interpolation placeholders""" os.chdir(self.test_dir)