traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-41818: Make test_openpty() avoid unexpected success due to number of rows and/or number of columns being == 0. (GH-23526)

This commit is contained in:
Soumendra Ganguly 2020-11-27 04:16:41 -06:00 committed by GitHub
parent c8aaf71dde
commit f5a19ead4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Lib/test/test_pty.py
View File

@ -5,7 +5,6 @@ from test.support.import_helper import import_module
import_module('termios') import_module('termios')
import errno import errno
import pathlib
import pty import pty
import os import os
import sys import sys
@ -75,20 +74,7 @@ def _readline(fd):
return reader.readline() return reader.readline()
def expectedFailureIfStdinIsTTY(fun): def expectedFailureIfStdinIsTTY(fun):
# avoid isatty() for now # avoid isatty()
PLATFORM = platform.system()
if PLATFORM == "Linux":
os_release = pathlib.Path("/etc/os-release")
if os_release.exists():
# Actually the file has complex multi-line structure,
# these is no need to parse it for Gentoo check
if 'gentoo' in os_release.read_text().lower():
# bpo-41818:
# Gentoo passes the test,
# all other tested Linux distributions fail.
# Should not apply @unittest.expectedFailure() on Gentoo
# to keep the buildbot fleet happy.
return fun
try: try:
tty.tcgetattr(pty.STDIN_FILENO) tty.tcgetattr(pty.STDIN_FILENO)
return unittest.expectedFailure(fun) return unittest.expectedFailure(fun)
@ -165,11 +151,16 @@ class PtyTest(unittest.TestCase):
new_stdin_winsz = None new_stdin_winsz = None
if self.stdin_rows != None and self.stdin_cols != None: if self.stdin_rows != None and self.stdin_cols != None:
try: try:
# Modify pty.STDIN_FILENO window size; we need to
# check if pty.openpty() is able to set pty slave
# window size accordingly.
debug("Setting pty.STDIN_FILENO window size") debug("Setting pty.STDIN_FILENO window size")
# Set number of columns and rows to be the debug(f"original size: (rows={self.stdin_rows}, cols={self.stdin_cols})")
# floors of 1/5 of respective original values target_stdin_rows = self.stdin_rows + 1
target_stdin_winsz = struct.pack("HHHH", self.stdin_rows//5, target_stdin_cols = self.stdin_cols + 1
self.stdin_cols//5, 0, 0) debug(f"target size: (rows={target_stdin_rows}, cols={target_stdin_cols})")
target_stdin_winsz = struct.pack("HHHH", target_stdin_rows,
target_stdin_cols, 0, 0)
_set_term_winsz(pty.STDIN_FILENO, target_stdin_winsz) _set_term_winsz(pty.STDIN_FILENO, target_stdin_winsz)
# Were we able to set the window size # Were we able to set the window size

1
Misc/NEWS.d/next/Library/2020-11-27-09-19-43.bpo-41818.KWYUbL.rst Normal file
View File

@ -0,0 +1 @@
Make test_openpty() avoid unexpected success due to number of rows and/or number of columns being == 0.