From e308b7c0c0e31e1c4d6f82365ea9f7a6e21ec6fb Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Wed, 29 Feb 2012 16:16:15 -0800 Subject: also skip test_device_encoding when stdin isn't a tty --- Lib/test/test_os.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 5959d1e..e0c59fd 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1433,8 +1433,8 @@ class DeviceEncodingTests(unittest.TestCase): # Return None when an fd doesn't actually exist. self.assertIsNone(os.device_encoding(123456)) - @unittest.skipUnless(sys.platform.startswith('win') or - (hasattr(locale, 'nl_langinfo') and hasattr(locale, 'CODESET')), + @unittest.skipUnless(os.isatty(0) and (sys.platform.startswith('win') or + (hasattr(locale, 'nl_langinfo') and hasattr(locale, 'CODESET'))), 'test requires either Windows or nl_langinfo(CODESET)') def test_device_encoding(self): encoding = os.device_encoding(0) -- cgit v0.12