From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Mon, 19 Dec 2016 09:46:14 +0000 (+0100)
Subject: Issue #28996: Skip two tests that fail on Android with the locale strcoll() and
X-Git-Tag: v3.6.1rc1~283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bccb0e03db7fc3356b294a0d6c7a1687533ca38;p=thirdparty%2FPython%2Fcpython.git

Issue #28996: Skip two tests that fail on Android with the locale strcoll() and
strxfrm() functions.
---

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index fae2c3dabb37..99fab58cb932 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -1,4 +1,4 @@
-from test.support import verbose
+from test.support import verbose, is_android
 import unittest
 import locale
 import sys
@@ -353,7 +353,7 @@ class TestEnUSCollation(BaseLocalizedTest, TestCollation):
         enc = codecs.lookup(locale.getpreferredencoding(False) or 'ascii').name
         if enc not in ('utf-8', 'iso8859-1', 'cp1252'):
             raise unittest.SkipTest('encoding not suitable')
-        if enc != 'iso8859-1' and (sys.platform == 'darwin' or
+        if enc != 'iso8859-1' and (sys.platform == 'darwin' or is_android or
                                    sys.platform.startswith('freebsd')):
             raise unittest.SkipTest('wcscoll/wcsxfrm have known bugs')
         BaseLocalizedTest.setUp(self)