Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Tidy up remaining exceptions

Browse source 
Use the new handle_exception() function from ConsoleBase also.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-10-09 18:29:04 -06:00 • committed by Tom Rini
parent 85d7dae377
commit 9fa4be6598
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/py/u_boot_console_base.py
View file

@ -14,7 +14,7 @@ import pytest
import re
import sys
import u_boot_spawn
from u_boot_spawn import BootFail, Timeout, Unexpected
from u_boot_spawn import BootFail, Timeout, Unexpected, handle_exception
# Regexes for text we expect U-Boot to send to the console.
pattern_u_boot_spl_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))')
@ -293,12 +293,12 @@ class ConsoleBase(object):
# indentation.
return self.p.before.strip('\r\n')
except Timeout as exc:
self.log.error(str(exc))
self.cleanup_spawn()
handle_exception(self.config, self, self.log, exc, 'Lab failure',
True)
raise
except BootFail as ex:
self.log.error(str(ex))
self.cleanup_spawn()
except BootFail as exc:
handle_exception(self.config, self, self.log, exc, 'Boot fail',
True, self.get_spawn_output())
raise
finally:
self.log.timestamp()