From 12203068b989b856eb1d1fa18d593532656e5761 Mon Sep 17 00:00:00 2001 From: James Tocknell Date: Fri, 11 Oct 2019 14:40:06 +1100 Subject: [PATCH] CI: Display coverage stdout/err always --- ci/upload_coverage.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ci/upload_coverage.py b/ci/upload_coverage.py index 106a6d045..235f65b02 100644 --- a/ci/upload_coverage.py +++ b/ci/upload_coverage.py @@ -33,12 +33,20 @@ def run_with_python(args, **kwargs): exe = [] cmd = exe + args msg("Running:", *cmd) - res = run(cmd, check=True, stdout=PIPE, stderr=PIPE, **kwargs) - msg("STDOUT:") - sys.stdout.buffer.write(res.stdout) - msg("STDERR:") - sys.stderr.buffer.write(res.stdout) - return res + try: + res = run(cmd, check=True, stdout=PIPE, stderr=PIPE, **kwargs) + except CalledProcessError as e: + msg("STDOUT:") + sys.stdout.buffer.write(e.stdout) + msg("STDERR:") + sys.stderr.buffer.write(e.stdout) + raise + else: + msg("STDOUT:") + sys.stdout.buffer.write(res.stdout) + msg("STDERR:") + sys.stderr.buffer.write(res.stdout) + return res def send_coverage(*, workdir, coverage_files, codecov_token):