From 1121b5e6a976c82d38698e45a8cf493079b3d1ab Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 25 Nov 2015 16:20:04 +0200 Subject: [PATCH] Issue #25703: Skip test_43581 if one of stdout or stderr is redirected. --- Lib/test/test_sys.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index ab35ba48a7c..de13f2204b5 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -412,7 +412,10 @@ class SysModuleTest(unittest.TestCase): def test_43581(self): # Can't use sys.stdout, as this is a cStringIO object when # the test runs under regrtest. - self.assertTrue(sys.__stdout__.encoding == sys.__stderr__.encoding) + if not (os.environ.get('PYTHONIOENCODING') or + (sys.__stdout__.isatty() and sys.__stderr__.isatty())): + self.skipTest('stdout/stderr encoding is not set') + self.assertEqual(sys.__stdout__.encoding, sys.__stderr__.encoding) def test_sys_flags(self): self.assertTrue(sys.flags)