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

Added header to SMART self-test output

Browse source 
* Matches badblocks header
* Also added Initializing message
This commit is contained in:
2Shirt 2020-01-22 11:22:47 -07:00
parent e92ceb070c
commit bfc17942cd
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/wk/cfg/hw.py
View file

@ -130,7 +130,7 @@ TMUX_LAYOUT = OrderedDict({
# Testing panes # Testing panes
'Temps': {'height': 1000, 'Check': False}, 'Temps': {'height': 1000, 'Check': False},
'Prime95': {'height': 11, 'Check': False}, 'Prime95': {'height': 11, 'Check': False},
'SMART': {'height': 3, 'Check': True}, 'SMART': {'height': 4, 'Check': True},
'badblocks': {'height': 5, 'Check': True}, 'badblocks': {'height': 5, 'Check': True},
'I/O Benchmark': {'height': 1000, 'Check': False}, 'I/O Benchmark': {'height': 1000, 'Check': False},
}) })

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

@ -933,7 +933,7 @@ def disk_self_test(state, test_objects):
# Show progress # Show progress
if threads[-1].is_alive(): if threads[-1].is_alive():
state.panes['SMART'].append( state.panes['SMART'].append(
tmux.split_window(lines=3, vertical=True, watch_file=test_log), tmux.split_window(lines=4, vertical=True, watch_file=test_log),
) )
# Wait for all tests to complete # Wait for all tests to complete

10
scripts/wk/hw/obj.py
View file

@ -452,6 +452,12 @@ class Disk(BaseObj):
status_str = 'Starting self-test...' status_str = 'Starting self-test...'
test_details = self.get_smart_self_test_details() test_details = self.get_smart_self_test_details()
test_minutes = 15 test_minutes = 15
size_str = bytes_to_string(self.details["size"], use_binary=False)
header_str = color_string(
['[', self.path.name, ' ', size_str, ']'],
[None, 'BLUE', None, 'CYAN', None],
sep='',
)
# Check if disk supports self-tests # Check if disk supports self-tests
if not test_details: if not test_details:
@ -463,6 +469,8 @@ class Disk(BaseObj):
test_minutes = int(test_minutes) + 10 test_minutes = int(test_minutes) + 10
# Start test # Start test
with open(log_path, 'w') as _f:
_f.write(f'{header_str}\nInitializing...')
cmd = [ cmd = [
'sudo', 'sudo',
'smartctl', 'smartctl',
@ -487,7 +495,7 @@ class Disk(BaseObj):
# Update log # Update log
with open(log_path, 'w') as _f: with open(log_path, 'w') as _f:
_f.write(f'SMART self-test status for {self.path}:\n {status_str}') _f.write(f'{header_str}\nSMART self-test status:\n {status_str}')
# Check if finished # Check if finished
if 'remaining_percent' not in test_details['status']: if 'remaining_percent' not in test_details['status']: