Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

get_terminal_size() can also fail with ENOTTY if the fd is not connected to a terminal.

This commit is contained in:
Antoine Pitrou 2012-02-09 00:11:00 +01:00
parent cfade36227
commit 81a1fa5c77
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_os.py
View File

@ -1851,7 +1851,7 @@ class TermsizeTests(unittest.TestCase):
try:
size = os.get_terminal_size()
except OSError as e:
if e.errno == errno.EINVAL or sys.platform == "win32":
if sys.platform == "win32" or e.errno in (errno.EINVAL, errno.ENOTTY):
# Under win32 a generic OSError can be thrown if the
# handle cannot be retrieved
self.skipTest("failed to query terminal size")
@ -1873,7 +1873,14 @@ class TermsizeTests(unittest.TestCase):
self.skipTest("stty invocation failed")
expected = (int(size[1]), int(size[0])) # reversed order
actual = os.get_terminal_size(sys.__stdin__.fileno())
try:
actual = os.get_terminal_size(sys.__stdin__.fileno())
except OSError as e:
if sys.platform == "win32" or e.errno in (errno.EINVAL, errno.ENOTTY):
# Under win32 a generic OSError can be thrown if the
# handle cannot be retrieved
self.skipTest("failed to query terminal size")
raise
self.assertEqual(expected, actual)