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

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

Browse source
This commit is contained in:
2Shirt 2019-03-13 21:00:25 -06:00
commit b6ecf348d4
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.bin/Scripts/functions/data.py
View file

@ -1,9 +1,8 @@
# Wizard Kit: Functions - Data # Wizard Kit: Functions - Data
import ctypes import ctypes
import json
from functions.common import * from functions.json import *
from operator import itemgetter from operator import itemgetter
from settings.data import * from settings.data import *

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

@ -1525,6 +1525,7 @@ def run_nvme_smart_tests(state, test, update_mode=False):
test.update_status('Aborted') test.update_status('Aborted')
raise GenericAbort('Aborted') raise GenericAbort('Aborted')
elif dev.self_test_timed_out: elif dev.self_test_timed_out:
test.failed = True
test.update_status('TimedOut') test.update_status('TimedOut')
elif dev.override_disabled or 'OVERRIDE' not in test.status: elif dev.override_disabled or 'OVERRIDE' not in test.status:
# override_disabled is set to True if one or more critical attributes # override_disabled is set to True if one or more critical attributes