diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py index ddc9d2ab..94bbdc54 100644 --- a/scripts/wk/hw/obj.py +++ b/scripts/wk/hw/obj.py @@ -61,6 +61,22 @@ class CpuRam(): self.get_cpu_details() self.get_ram_details() + def generate_report(self): + """Generate CPU & RAM report, returns list.""" + report = [] + report.append(color_string('Device', 'BLUE')) + report.append(f' {self.description}') + + # Include RAM details + report.append(color_string('RAM', 'BLUE')) + report.append(f' {self.ram_total} ({", ".join(self.ram_dimms)})') + + # Tests + for test in self.tests.values(): + report.extend(test.report) + + return report + def get_cpu_details(self): """Get CPU details using OS specific methods.""" if platform.system() == 'Darwin': @@ -110,22 +126,6 @@ class CpuRam(): f'{count}x {desc}' for desc, count in sorted(details.items()) ] - def generate_report(self): - """Generate CPU & RAM report, returns list.""" - report = [] - report.append(color_string('Device', 'BLUE')) - report.append(f' {self.description}') - - # Include RAM details - report.append(color_string('RAM', 'BLUE')) - report.append(f' {self.ram_total} ({", ".join(self.ram_dimms)})') - - # Tests - for test in self.tests.values(): - report.extend(test.report) - - return report - class Disk(): """Object for tracking disk specific data."""