Commit c0983856 authored by Victor Stinner's avatar Victor Stinner

Fix test_main_invalid_unicode() of test_sys for ASCII locale encoding

It should fix sparc 3.x and 3.1 failures.
parent 1465cc28
...@@ -152,7 +152,7 @@ class SysModuleTest(unittest.TestCase): ...@@ -152,7 +152,7 @@ class SysModuleTest(unittest.TestCase):
stdout, stderr = process.communicate() stdout, stderr = process.communicate()
self.assertEqual(process.returncode, 1) self.assertEqual(process.returncode, 1)
self.assertTrue(stderr.startswith(expected), self.assertTrue(stderr.startswith(expected),
"%r doesn't start with %r" % (stderr, expected)) "%s doesn't start with %s" % (ascii(stderr), ascii(expected)))
# test that stderr buffer if flushed before the exit message is written # test that stderr buffer if flushed before the exit message is written
# into stderr # into stderr
...@@ -485,9 +485,8 @@ class SysModuleTest(unittest.TestCase): ...@@ -485,9 +485,8 @@ class SysModuleTest(unittest.TestCase):
p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE) p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
self.assertEqual(p.returncode, 1) self.assertEqual(p.returncode, 1)
self.assert_(stderr.startswith(b"UnicodeEncodeError: " self.assert_(b"UnicodeEncodeError:" in stderr,
b"'utf-8' codec can't encode character '\\udcff' in " "%r not in %s" % (b"UniodeEncodeError:", ascii(stderr)))
b"position 7: surrogates not allowed"), stderr)
def test_sys_flags(self): def test_sys_flags(self):
self.assertTrue(sys.flags) self.assertTrue(sys.flags)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment