Message ID | 20240516084059.511463-2-thuth@redhat.com |
---|---|
State | New |
Headers | show |
Series | tests: Remove xfsprogs and g++ from the dockerfiles | expand |
On Thu, May 16, 2024 at 10:40:55AM +0200, Thomas Huth wrote: > In case lcitool fails (e.g. with a python backtrace), this makes > the output of lcitool much more readable. > > Suggested-by: Daniel P. Berrangé <berrange@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/lcitool/refresh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 24a735a3f2..174818d9c9 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -43,12 +43,12 @@ def atomic_write(filename, content): def generate(filename, cmd, trailer): print("Generate %s" % filename) - lcitool = subprocess.run(cmd, capture_output=True) + lcitool = subprocess.run(cmd, capture_output=True, encoding='utf8') if lcitool.returncode != 0: raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr)) - content = lcitool.stdout.decode("utf8") + content = lcitool.stdout if trailer is not None: content += trailer atomic_write(filename, content)
In case lcitool fails (e.g. with a python backtrace), this makes the output of lcitool much more readable. Suggested-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/lcitool/refresh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)