Only disable disk tests for critical failures

* Addressees issue #109 and #112
This commit is contained in:
2Shirt 2019-11-18 19:34:53 -07:00
parent 214e2c345d
commit 8c4ed4ffc5
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -1574,7 +1574,6 @@ def run_mprime_test(state, test):
command=['hw-diags-prime95', global_vars['TmpDir']], command=['hw-diags-prime95', global_vars['TmpDir']],
working_dir=global_vars['TmpDir']) working_dir=global_vars['TmpDir'])
time_limit = MPRIME_LIMIT * 60 time_limit = MPRIME_LIMIT * 60
time_limit = 14
try: try:
for i in range(time_limit): for i in range(time_limit):
#clear_screen() #clear_screen()
@ -1786,18 +1785,19 @@ def run_nvme_smart_tests(state, test, update_mode=False):
# have exceeded the Error threshold. This overrules an override. # have exceeded the Error threshold. This overrules an override.
test.failed = True test.failed = True
test.update_status('FAIL') test.update_status('FAIL')
elif dev.is_aging():
test.failed = True
test.update_status('FAIL')
else: else:
# This dev lacks both NVMe and SMART data. This test should've been # This dev lacks both NVMe and SMART data. This test should've been
# disabled during the safety_check(). # disabled during the safety_check().
pass pass
# Disable other disk tests if necessary # Disable other disk tests if necessary
if test.failed and not update_mode: if not dev.disk_ok and dev.override_disabled:
# Only block other tests if critical attributes have failed
for t in ['badblocks', 'I/O Benchmark']: for t in ['badblocks', 'I/O Benchmark']:
dev.disable_test(t, 'Denied') dev.disable_test(t, 'Denied')
if dev.is_aging() and not update_mode:
test.failed = True
test.update_status('FAIL')
# Done # Done
update_progress_pane(state) update_progress_pane(state)