From ec46864922d2aab4fb266ae8317d553ec9ef3d9b Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 10 Apr 2019 00:02:38 +0200 Subject: [PATCH] run: pass through stdin, just close then --- src/_pytest/pytester.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index 21f8ed26b..6dc9031df 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -1096,10 +1096,6 @@ class Testdir(object): stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN) raise_on_kwargs(kwargs) - popen_kwargs = {"stdin": stdin} - if isinstance(stdin, bytes): - popen_kwargs["stdin"] = subprocess.PIPE - 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() popen = self.popen( cmdargs, + stdin=stdin, stdout=f1, stderr=f2, close_fds=(sys.platform != "win32"), - **popen_kwargs ) if isinstance(stdin, bytes): - popen.stdin.write(stdin) popen.stdin.close() def handle_timeout():