Merge remote-tracking branch 'upstream/dev' into dev

Fixed issue #41
2019-02-05 21:50:50 -07:00 · 2019-02-05 21:50:50 -07:00 · 3428e9dff8
commit 3428e9dff8
parent e02cf4a602 017c0e3385
1 changed files with 2 additions and 1 deletions
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@ -989,6 +989,7 @@ def run_badblocks_test(state, test):
    else:
      test.report.append('  {YELLOW}{line}{CLEAR}'.format(
        line=line, **COLORS))
+      if not test.aborted:
        test.failed = True
  if test.aborted:
    test.report.append('  {YELLOW}Aborted{CLEAR}'.format(**COLORS))