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

Return to HW-Diags menu from safety_check()

Browse source
This commit is contained in:
2Shirt 2019-03-11 13:26:11 -06:00
parent 7701418e55
commit 7f6509d235
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -210,7 +210,7 @@ class DiskObj():
print_warning('WARNING: {}'.format(msg)) print_warning('WARNING: {}'.format(msg))
print_standard(' ') print_standard(' ')
if ask('Abort HW Diagnostics?'): if ask('Abort HW Diagnostics?'):
exit_script() raise GenericAbort('Bail')
# Add warning note # Add warning note
self.add_nvme_smart_note( self.add_nvme_smart_note(
@ -982,7 +982,12 @@ def run_hw_tests(state):
_disk_tests_enabled |= state.tests[k]['Enabled'] _disk_tests_enabled |= state.tests[k]['Enabled']
if _disk_tests_enabled: if _disk_tests_enabled:
for disk in state.disks: for disk in state.disks:
disk.safety_check(silent=state.quick_mode) try:
disk.safety_check(silent=state.quick_mode)
except GenericAbort:
tmux_kill_pane(*state.panes.values())
state.panes.clear()
return
# Run tests # Run tests
## Because state.tests is an OrderedDict and the disks were added ## Because state.tests is an OrderedDict and the disks were added