2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Save RAM details to CpuObj

Browse source
This commit is contained in:
2Shirt 2019-06-12 16:37:04 -06:00
parent 5b5c99e6f8
commit e798503f6f
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.bin/Scripts/functions/hw_diags.py
View file

@ -52,6 +52,12 @@ class CpuObj():
continue continue
self.lscpu[_field] = _data self.lscpu[_field] = _data
# Get RAM details as well
ram_details = get_ram_details()
self.ram_total = human_readable_size(ram_details.pop('Total', 0)).strip()
self.ram_dimms = [
'{}x {}'.format(v, k) for k, v in sorted(ram_details.items())]
def generate_cpu_report(self): def generate_cpu_report(self):
"""Generate CPU report with data from all tests.""" """Generate CPU report with data from all tests."""
report = [] report = []
@ -59,11 +65,8 @@ class CpuObj():
report.append(' {}'.format(self.name)) report.append(' {}'.format(self.name))
# Include RAM details # Include RAM details
ram_details = get_ram_details()
ram_total = human_readable_size(ram_details.pop('Total', 0)).strip()
ram_dimms = ['{}x {}'.format(v, k) for k, v in sorted(ram_details.items())]
report.append('{BLUE}RAM{CLEAR}'.format(**COLORS)) report.append('{BLUE}RAM{CLEAR}'.format(**COLORS))
report.append(' {} ({})'.format(ram_total, ', '.join(ram_dimms))) report.append(' {} ({})'.format(self.ram_total, ', '.join(self.ram_dimms)))
# Tests # Tests
for test in self.tests.values(): for test in self.tests.values():