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

Adjusted log and results screen

Browse source
This commit is contained in:
2Shirt 2018-12-14 18:58:32 -07:00
parent 37b8676b9c
commit f2a519b7ec
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,9 +157,7 @@ class DiskObj():
print_standard(' (Have you tried swapping the disk cable?)') print_standard(' (Have you tried swapping the disk cable?)')
else: else:
# Override? # Override?
for line in self.generate_report(): show_report(self.generate_report())
print(line)
print_log(strip_colors(line))
print_warning('{} error(s) detected.'.format(attr_type)) print_warning('{} error(s) detected.'.format(attr_type))
if override_disabled: if override_disabled:
print_standard('Tests disabled for this device') print_standard('Tests disabled for this device')
@ -756,6 +754,7 @@ def run_badblocks_test(state, test):
# Bail early # Bail early
if test.disabled: if test.disabled:
return return
print_log('Starting badblocks test for {}'.format(test.dev.path))
tmux_update_pane( tmux_update_pane(
state.panes['Top'], text='{}\n{}'.format( state.panes['Top'], text='{}\n{}'.format(
TOP_PANE_TEXT, 'badblocks')) TOP_PANE_TEXT, 'badblocks'))
@ -837,6 +836,7 @@ def run_io_benchmark(state, test):
# Bail early # Bail early
if test.disabled: if test.disabled:
return return
print_log('Starting I/O benchmark test for {}'.format(test.dev.path))
tmux_update_pane( tmux_update_pane(
state.panes['Top'], text='{}\n{}'.format( state.panes['Top'], text='{}\n{}'.format(
TOP_PANE_TEXT, 'I/O Benchmark')) TOP_PANE_TEXT, 'I/O Benchmark'))
@ -859,6 +859,7 @@ def run_mprime_test(state, test):
# Bail early # Bail early
if test.disabled: if test.disabled:
return return
print_log('Starting Prime95 test')
test.started = True test.started = True
test.update_status() test.update_status()
update_progress_pane(state) update_progress_pane(state)
@ -1047,6 +1048,7 @@ def run_nvme_smart_tests(state, test):
# Bail early # Bail early
if test.disabled: if test.disabled:
return return
print_log('Starting NVMe/SMART test for {}'.format(test.dev.path))
_include_short_test = False _include_short_test = False
test.started = True test.started = True
test.update_status() test.update_status()
@ -1168,6 +1170,12 @@ def secret_screensaver(screensaver=None):
raise Exception('Invalid screensaver') raise Exception('Invalid screensaver')
run_program(cmd, check=False, pipe=False) run_program(cmd, check=False, pipe=False)
def show_report(report):
"""Show report on screen and save to log w/out color."""
for line in report:
print(line)
print_log(strip_colors(line))
def show_results(state): def show_results(state):
"""Show results for all tests.""" """Show results for all tests."""
clear_screen() clear_screen()
@ -1180,11 +1188,7 @@ def show_results(state):
continue continue
print_success('{}:'.format(k)) print_success('{}:'.format(k))
for obj in v['Objects']: for obj in v['Objects']:
for line in obj.report: show_report(obj.report)
print(line)
print_log(strip_colors(line))
print_standard(' ')
if 'Prime95' not in k:
print_standard(' ') print_standard(' ')
def update_main_options(state, selection, main_options): def update_main_options(state, selection, main_options):