diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-25 14:20:04 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-25 14:20:04 (GMT) |
commit | 1121b5e6a976c82d38698e45a8cf493079b3d1ab (patch) | |
tree | fd87baa1ecdf5a89023f2983ebadd00793ff0f4a | |
parent | 8addf280a9edf2b6ea8395cc2dcfb12ca9bf1ea8 (diff) | |
download | cpython-1121b5e6a976c82d38698e45a8cf493079b3d1ab.zip cpython-1121b5e6a976c82d38698e45a8cf493079b3d1ab.tar.gz cpython-1121b5e6a976c82d38698e45a8cf493079b3d1ab.tar.bz2 |
Issue #25703: Skip test_43581 if one of stdout or stderr is redirected.
-rw-r--r-- | Lib/test/test_sys.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index ab35ba4..de13f22 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) |