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

This commit is contained in:
2Shirt 2019-04-02 16:37:09 -07:00
commit 6a7ef8ebcb
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -1050,7 +1050,9 @@ def run_hw_tests(state):
# Recheck attributes
if state.tests['NVMe / SMART']['Enabled']:
for test_obj in state.tests['NVMe / SMART']['Objects']:
run_nvme_smart_tests(state, test_obj, update_mode=True)
if test_obj.dev is not None:
# dev == None for the 'N/A' lines set above
run_nvme_smart_tests(state, test_obj, update_mode=True)
except GenericAbort:
# Cleanup