Coding style.
- Missed this when switching to subprocess.run.
This commit is contained in:
parent
af162fcecf
commit
44abbfe53d
2 changed files with 7 additions and 8 deletions
|
|
@ -245,9 +245,8 @@ def test_against_ls(root_path, environment):
|
||||||
process = subprocess.run(
|
process = subprocess.run(
|
||||||
["ls", "--color=always", "-R", root_path],
|
["ls", "--color=always", "-R", root_path],
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environment)
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environment)
|
||||||
stdout, stderr = process.communicate()
|
|
||||||
color_codes = lscolors.get_color_codes(environment)
|
color_codes = lscolors.get_color_codes(environment)
|
||||||
for line in stdout.splitlines():
|
for line in process.stdout.splitlines():
|
||||||
line = line.strip()
|
line = line.strip()
|
||||||
if line == "":
|
if line == "":
|
||||||
continue
|
continue
|
||||||
|
|
|
||||||
|
|
@ -109,14 +109,15 @@ def _fix_input(input_):
|
||||||
def _do_command(command, timeout=None, **kwargs):
|
def _do_command(command, timeout=None, **kwargs):
|
||||||
stdout, stderr = "", ""
|
stdout, stderr = "", ""
|
||||||
with contextlib.suppress(subprocess.CalledProcessError):
|
with contextlib.suppress(subprocess.CalledProcessError):
|
||||||
process = subprocess.run(command, stdout=subprocess.PIPE,
|
|
||||||
stderr=subprocess.PIPE, **kwargs)
|
|
||||||
try:
|
try:
|
||||||
stdout, stderr = process.communicate(timeout=timeout)
|
process = subprocess.run(command, stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE, timeout=timeout,
|
||||||
|
**kwargs)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
process.kill()
|
process.kill()
|
||||||
raise
|
raise
|
||||||
return _fix_input(stdout), _fix_input(stderr), process.returncode
|
return (_fix_input(process.stdout), _fix_input(process.stderr),
|
||||||
|
process.returncode)
|
||||||
|
|
||||||
|
|
||||||
def _run_command(command, success_status=None, error_status=None):
|
def _run_command(command, success_status=None, error_status=None):
|
||||||
|
|
@ -126,8 +127,7 @@ def _run_command(command, success_status=None, error_status=None):
|
||||||
try:
|
try:
|
||||||
process = subprocess.run(command, stdout=subprocess.PIPE,
|
process = subprocess.run(command, stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.PIPE)
|
stderr=subprocess.PIPE)
|
||||||
stdout, stderr = process.communicate()
|
output = process.stdout + process.stderr
|
||||||
output = stdout + stderr
|
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
status = error_status
|
status = error_status
|
||||||
if process.returncode != 0:
|
if process.returncode != 0:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue