Post Prime95 results for aborted tests
This commit is contained in:
parent
904b41dbae
commit
08768424f0
1 changed files with 10 additions and 9 deletions
|
|
@ -960,6 +960,9 @@ def run_mprime(ticket_number):
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
# Catch CTRL+C
|
# Catch CTRL+C
|
||||||
aborted = True
|
aborted = True
|
||||||
|
TESTS['Prime95']['Status'] = 'Aborted'
|
||||||
|
print_warning('\nAborted.')
|
||||||
|
update_progress()
|
||||||
|
|
||||||
# Save "final" temps
|
# Save "final" temps
|
||||||
run_program(
|
run_program(
|
||||||
|
|
@ -1007,15 +1010,7 @@ def run_mprime(ticket_number):
|
||||||
TESTS['Prime95']['CS'] = bool(r)
|
TESTS['Prime95']['CS'] = bool(r)
|
||||||
|
|
||||||
# Update status
|
# Update status
|
||||||
if aborted:
|
if not aborted:
|
||||||
TESTS['Prime95']['Status'] = 'Aborted'
|
|
||||||
print_warning('\nAborted.')
|
|
||||||
update_progress()
|
|
||||||
if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
|
|
||||||
if not ask('Proceed to next test?'):
|
|
||||||
run_program('tmux kill-pane -a'.split())
|
|
||||||
raise GenericError
|
|
||||||
else:
|
|
||||||
if TESTS['Prime95']['NS']:
|
if TESTS['Prime95']['NS']:
|
||||||
TESTS['Prime95']['Status'] = 'NS'
|
TESTS['Prime95']['Status'] = 'NS'
|
||||||
elif TESTS['Prime95']['CS']:
|
elif TESTS['Prime95']['CS']:
|
||||||
|
|
@ -1056,6 +1051,12 @@ def run_mprime(ticket_number):
|
||||||
ticket_id=ticket_number,
|
ticket_id=ticket_number,
|
||||||
response='\n'.join(report))
|
response='\n'.join(report))
|
||||||
|
|
||||||
|
if aborted:
|
||||||
|
if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
|
||||||
|
if not ask('Proceed to next test?'):
|
||||||
|
run_program('tmux kill-pane -a'.split())
|
||||||
|
raise GenericError
|
||||||
|
|
||||||
# Done
|
# Done
|
||||||
run_program('tmux kill-pane -a'.split())
|
run_program('tmux kill-pane -a'.split())
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue