p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move CLOSE_STDIN to class

This commit is contained in:
Daniel Hahler 2019-04-10 00:01:15 +02:00
parent 4fca86e2af
commit c36a90531a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/_pytest/pytester.py
View File

@ -36,8 +36,6 @@ IGNORE_PAM = [ # filenames added when obtaining details about the current user
u"/var/lib/sss/mc/passwd" u"/var/lib/sss/mc/passwd"
] ]
CLOSE_STDIN = object
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addoption( parser.addoption(
@ -475,6 +473,8 @@ class Testdir(object):
""" """
CLOSE_STDIN = object
class TimeoutExpired(Exception): class TimeoutExpired(Exception):
pass pass
@ -1059,7 +1059,7 @@ class Testdir(object):
env["USERPROFILE"] = env["HOME"] env["USERPROFILE"] = env["HOME"]
kw["env"] = env kw["env"] = env
if stdin is CLOSE_STDIN: if stdin is Testdir.CLOSE_STDIN:
kw["stdin"] = subprocess.PIPE kw["stdin"] = subprocess.PIPE
elif isinstance(stdin, bytes): elif isinstance(stdin, bytes):
kw["stdin"] = subprocess.PIPE kw["stdin"] = subprocess.PIPE
@ -1067,7 +1067,7 @@ class Testdir(object):
kw["stdin"] = stdin kw["stdin"] = stdin
popen = subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw) popen = subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw)
if stdin is CLOSE_STDIN: if stdin is Testdir.CLOSE_STDIN:
popen.stdin.close() popen.stdin.close()
elif isinstance(stdin, bytes): elif isinstance(stdin, bytes):
popen.stdin.write(stdin) popen.stdin.write(stdin)
@ -1093,7 +1093,7 @@ class Testdir(object):
__tracebackhide__ = True __tracebackhide__ = True
timeout = kwargs.pop("timeout", None) timeout = kwargs.pop("timeout", None)
stdin = kwargs.pop("stdin", CLOSE_STDIN) stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN)
raise_on_kwargs(kwargs) raise_on_kwargs(kwargs)
popen_kwargs = {"stdin": stdin} popen_kwargs = {"stdin": stdin}