This commit is contained in:
Divyansh Singh 2023-03-23 01:18:06 +05:30
parent 3b5ede8044
commit 1e3a3bf1e7
2 changed files with 3 additions and 5 deletions

View file

@ -220,10 +220,8 @@ def execute_command_and_capture_output(
stdout. If shell is True, execute the command within a shell. If an extra environment dict is
given, then use it to augment the current environment, and pass the result into the command. If
a working directory is given, use that as the present working directory when running the command.
If raise on exit code one is False, then treat exit code 1 as a warning instead of an error.
Raise subprocesses.CalledProcessError if an error occurs while running the command, or if the
command exits with a non-zero exit code and raise on exit code one is True.
Raise subprocesses.CalledProcessError if an error occurs while running the command.
'''
log_command(full_command)
environment = {**os.environ, **extra_environment} if extra_environment else None
@ -239,7 +237,7 @@ def execute_command_and_capture_output(
)
logger.warning('Command output: {}'.format(output))
except subprocess.CalledProcessError as error:
if exit_code_indicates_error(error.returncode):
if exit_code_indicates_error(command, error.returncode):
raise
output = error.output
logger.warning('Command output: {}'.format(output))

View file

@ -254,7 +254,7 @@ def test_execute_command_and_capture_output_returns_output_when_error_code_is_on
assert output == expected_output
def test_execute_command_and_capture_output_returns_output_when_error_code_not_one():
def test_execute_command_and_capture_output_raises_when_command_errors():
full_command = ['foo', 'bar']
expected_output = '[]'
flexmock(module.os, environ={'a': 'b'})