Merge branch 'project-overhaul' into dev

This commit is contained in:
2Shirt 2020-02-03 18:11:07 -07:00
commit a354e67642
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 5 additions and 1 deletions

View file

@ -1,4 +1,4 @@
Copyright (c) 2019 Alan Mason
Copyright (c) 2020 Alan Mason
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View file

@ -35,6 +35,7 @@ NVME_WARNING_KEYS = (
'reliability_degraded',
'volatile_memory_backup_failed',
)
SMART_SELF_TEST_START_TIMEOUT_IN_SECONDS = 120
WK_LABEL_REGEX = re.compile(
fr'{KIT_NAME_SHORT}_(LINUX|UFD)',
re.IGNORECASE,
@ -504,6 +505,9 @@ class Disk(BaseObj):
elif 'remaining_percent' in test_details.get('status', {}):
started = True
elif _i * 5 >= SMART_SELF_TEST_START_TIMEOUT_IN_SECONDS:
# Test didn't start within limit, stop waiting
break
# Check result
if finished: