mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 08:58:27 -07:00
abf9a58bad
Includes backported upstream workaround for python2.7 test failure. Bug: https://bugs.gentoo.org/644226 Signed-off-by: Marek Szuba <marecki@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
--- a/test/test_Script.py
|
|
+++ b/test/test_Script.py
|
|
@@ -40,12 +40,16 @@ class TestScript(TestCase):
|
|
if unicode_32bit:
|
|
self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
|
|
else:
|
|
- self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
|
|
+ self.assertTrue(
|
|
+ (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
|
|
+ (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
|
|
|
|
pairs = UnicodeString(pairs)
|
|
# iterating UChar, not codepoints
|
|
names = [Script.getScript(c).getShortName() for c in pairs]
|
|
- self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
|
|
+ self.assertTrue(
|
|
+ (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
|
|
+ (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
|
|
|
|
# iterating codepoints not UChar
|
|
names = [Script.getScript(cp).getShortName()
|
|
@@ -53,7 +57,9 @@ class TestScript(TestCase):
|
|
if unicode_32bit:
|
|
self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
|
|
else:
|
|
- self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
|
|
+ self.assertTrue(
|
|
+ (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
|
|
+ (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
|
|
|
|
# iterating codepoints, not UChar
|
|
names = [Script.getScript(pairs.char32At(i)).getShortName()
|
|
|