Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are

loaded from .py[co] files.

Lib/test/test_codeccallbacks.py

@@ -84,9 +84,9 @@ class CodecCallbackTest(unittest.TestCase):
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                   '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for encoding in ['ascii', 'latin1', 'iso-8859-15']:
             for s, exp in tests:
                 self.assertEqual(s.encode(encoding, 'xmlcharrefreplace'),

Lib/test/test_unicode.py

@@ -1663,9 +1663,9 @@ class UnicodeTest(
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                  '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for s, exp in tests:
             self.assertEqual(
                     unicode_encodedecimal(u"123" + s, "xmlcharrefreplace"),

Misc/NEWS

@@ -12,6 +12,12 @@ Core and Builtins
 Library
 -------
 
+Tests
+-----
+
+- Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are
+  loaded from .py[co] files.
+
 
 Whats' New in Python 2.7.6?
 ===========================