From 8c4ed4ffc5016a9b1d02822e5ab9a5e8c2816350 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 18 Nov 2019 19:34:53 -0700
Subject: [PATCH] Only disable disk tests for critical failures

* Addressees issue #109 and #112
---
 .bin/Scripts/functions/hw_diags.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 39286f5b..f8fe1d73 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1574,7 +1574,6 @@ def run_mprime_test(state, test):
     command=['hw-diags-prime95', global_vars['TmpDir']],
     working_dir=global_vars['TmpDir'])
   time_limit = MPRIME_LIMIT * 60
-  time_limit = 14
   try:
     for i in range(time_limit):
       #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.
       test.failed = True
       test.update_status('FAIL')
+    elif dev.is_aging():
+      test.failed = True
+      test.update_status('FAIL')
   else:
     # This dev lacks both NVMe and SMART data. This test should've been
     # disabled during the safety_check().
     pass
 
   # 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']:
       dev.disable_test(t, 'Denied')
-  if dev.is_aging() and not update_mode:
-    test.failed = True
-    test.update_status('FAIL')
 
   # Done
   update_progress_pane(state)