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

Updated badblocks section

Browse source 
* Start tests in reverse order (so they appear in order on screen)
* Fixed report parsing
This commit is contained in:
2Shirt 2019-12-05 22:57:13 -07:00
parent 76772be422
commit d173d317e3
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/wk/hw/diags.py
View file

@ -553,7 +553,7 @@ def disk_self_test(state, test_objects):
f'Disk self-test{"s" if len(test_objects) > 1 else ""}',
)
std.print_info(f'Starting self-test{"s" if len(test_objects) > 1 else ""}')
for test in test_objects:
for test in reversed(test_objects):
test.set_status('Working')
test_log = f'{state.log_dir}/{test.dev.path.name}_selftest.log'
@ -631,10 +631,13 @@ def disk_surface_scan(state, test_objects):
)
# Check results
with open(log_path, 'a') as _f:
with open(log_path, 'r') as _f:
# Skip first line
_f.readline()
# Check the rest
for line in _f.readlines():
line = line.strip()
if not line or line.startswith('Checking'):
if not line or line.startswith('Checking' or line.startswith('[')):
# Skip
continue
if re.search(f'^Pass completed.*0.*0/0/0', line, re.IGNORECASE):
@ -655,7 +658,7 @@ def disk_surface_scan(state, test_objects):
std.print_info(
f'Starting disk surface scan{"s" if len(test_objects) > 1 else ""}',
)
for test in test_objects:
for test in reversed(test_objects):
test_log = f'{state.log_dir}/{test.dev.path.name}_badblocks.log'
# Start thread