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

Cleanup and fix results screen during abort

Browse source 
* Renamed run_smart to run_nvme_smart to match rest of the code
* Mark NVMe/SMART status as NS earlier in a couple more cases
* Prevent crash when all tests are run and then aborted during Prime95
This commit is contained in:
2Shirt 2017-12-27 04:22:02 -07:00
parent 7fbbde56c6
commit 16c20ac6ea
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@ def run_mprime():
# Done # Done
run_program('tmux kill-pane -a'.split()) run_program('tmux kill-pane -a'.split())
def run_smart(): def run_nvme_smart():
aborted = False aborted = False
clear_screen() clear_screen()
print_log('\nStart NVMe/SMART test(s)\n') print_log('\nStart NVMe/SMART test(s)\n')
@ -378,7 +378,7 @@ def run_tests(tests):
mprime_aborted = True mprime_aborted = True
if not mprime_aborted: if not mprime_aborted:
if TESTS['NVMe/SMART']['Enabled']: if TESTS['NVMe/SMART']['Enabled']:
run_smart() run_nvme_smart()
if TESTS['badblocks']['Enabled']: if TESTS['badblocks']['Enabled']:
run_badblocks() run_badblocks()
@ -445,6 +445,7 @@ def scan_disks():
if ask('Run badblocks for this device anyway?'): if ask('Run badblocks for this device anyway?'):
TESTS['NVMe/SMART']['Status'][dev_name] = 'OVERRIDE' TESTS['NVMe/SMART']['Status'][dev_name] = 'OVERRIDE'
else: else:
TESTS['NVMe/SMART']['Status'][dev_name] = 'NS'
TESTS['badblocks']['Status'][dev_name] = 'Denied' TESTS['badblocks']['Status'][dev_name] = 'Denied'
print_standard(' ') # In case there's more than one "OVERRIDE" disk print_standard(' ') # In case there's more than one "OVERRIDE" disk
@ -522,7 +523,7 @@ def show_disk_details(dev):
print_error(raw_str, timestamp=False) print_error(raw_str, timestamp=False)
if not threshold.get('Ignore', False): if not threshold.get('Ignore', False):
dev['Quick Health OK'] = False dev['Quick Health OK'] = False
TESTS['SMART']['Status'][dev_name] = 'NS' TESTS['NVMe/SMART']['Status'][dev_name] = 'NS'
elif (threshold.get('Warning', False) and elif (threshold.get('Warning', False) and
raw_num >= threshold.get('Warning', -1)): raw_num >= threshold.get('Warning', -1)):
print_warning(raw_str, timestamp=False) print_warning(raw_str, timestamp=False)
@ -568,14 +569,15 @@ def show_results():
# NVMe/SMART / badblocks # NVMe/SMART / badblocks
if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']: if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
print_success('\nDisks:') print_success('Disks:')
for name, dev in sorted(TESTS['NVMe/SMART']['Devices'].items()): for name, dev in sorted(TESTS['NVMe/SMART']['Devices'].items()):
show_disk_details(dev) show_disk_details(dev)
bb_status = TESTS['badblocks']['Status'].get(name, None) bb_status = TESTS['badblocks']['Status'].get(name, None)
if (TESTS['badblocks']['Enabled'] if (TESTS['badblocks']['Enabled']
and bb_status not in ['Denied', 'OVERRIDE', 'Skipped']): and bb_status not in ['Denied', 'OVERRIDE', 'Skipped']):
print_info('badblocks:') print_info('badblocks:')
for line in TESTS['badblocks']['Results'][name].splitlines(): result = TESTS['badblocks']['Results'].get(name, '')
for line in result.splitlines():
if re.search(r'Pass completed', line, re.IGNORECASE): if re.search(r'Pass completed', line, re.IGNORECASE):
line = re.sub( line = re.sub(
r'Pass completed,?\s+', r'', r'Pass completed,?\s+', r'',