From e798503f6f2db6fd3382e5ba62dbbbe9a2820b33 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 12 Jun 2019 16:37:04 -0600 Subject: [PATCH] Save RAM details to CpuObj --- .bin/Scripts/functions/hw_diags.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index ea19e90f..fe390e12 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -52,6 +52,12 @@ class CpuObj(): continue 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): """Generate CPU report with data from all tests.""" report = [] @@ -59,11 +65,8 @@ class CpuObj(): report.append(' {}'.format(self.name)) # 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(' {} ({})'.format(ram_total, ', '.join(ram_dimms))) + report.append(' {} ({})'.format(self.ram_total, ', '.join(self.ram_dimms))) # Tests for test in self.tests.values():