Fix potential render tests error with invalid utf-8 characters

In general should not happen, but better to report the actual error instead
of the Python test code failing.
This commit is contained in:
Brecht Van Lommel 2021-09-28 20:36:20 +02:00
parent 95fca22bfe
commit cc653c9b02
2 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ def get_cpu_name() -> str:
return platform.processor()
elif platform.system() == "Darwin":
cmd = ['/usr/sbin/sysctl', "-n", "machdep.cpu.brand_string"]
return subprocess.check_output(cmd).strip().decode('utf-8')
return subprocess.check_output(cmd).strip().decode('utf-8', 'ignore')
else:
with open('/proc/cpuinfo') as f:
for line in f:

View File

@ -410,7 +410,7 @@ class Report:
failed = False
except subprocess.CalledProcessError as e:
if self.verbose:
print_message(e.output.decode("utf-8"))
print_message(e.output.decode("utf-8", 'ignore'))
failed = e.returncode != 1
else:
if not self.update:
@ -437,7 +437,7 @@ class Report:
subprocess.check_output(command)
except subprocess.CalledProcessError as e:
if self.verbose:
print_message(e.output.decode("utf-8"))
print_message(e.output.decode("utf-8", 'ignore'))
return not failed
@ -488,7 +488,7 @@ class Report:
if verbose:
print(" ".join(command))
if (verbose or crash) and output:
print(output.decode("utf-8"))
print(output.decode("utf-8", 'ignore'))
# Detect missing filepaths and consider those errors
for filepath, output_filepath in zip(remaining_filepaths[:], output_filepaths):