floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run: pass through stdin, just close then

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

7
src/_pytest/pytester.py
View File

@ -1096,10 +1096,6 @@ class Testdir(object):
stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN) stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN)
raise_on_kwargs(kwargs) raise_on_kwargs(kwargs)
popen_kwargs = {"stdin": stdin}
if isinstance(stdin, bytes):
popen_kwargs["stdin"] = subprocess.PIPE
cmdargs = [ cmdargs = [
str(arg) if isinstance(arg, py.path.local) else arg for arg in cmdargs str(arg) if isinstance(arg, py.path.local) else arg for arg in cmdargs
] ]
@ -1113,13 +1109,12 @@ class Testdir(object):
now = time.time() now = time.time()
popen = self.popen( popen = self.popen(
cmdargs, cmdargs,
stdin=stdin,
stdout=f1, stdout=f1,
stderr=f2, stderr=f2,
close_fds=(sys.platform != "win32"), close_fds=(sys.platform != "win32"),
**popen_kwargs
) )
if isinstance(stdin, bytes): if isinstance(stdin, bytes):
popen.stdin.write(stdin)
popen.stdin.close() popen.stdin.close()
def handle_timeout(): def handle_timeout():