diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-27 08:48:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-27 08:48:47 -0400 |
| commit | 0fdc468b069b09bf176fe0255f3ef88f88ef3be0 (patch) | |
| tree | 6d64f247c0585aab38adf27f6b164493f569cdef /test/py/u_boot_console_base.py | |
| parent | 661f5400754750df4104b6466942c8b62897340d (diff) | |
| parent | d64ac8549d97cfc37bd629a60f0d502bcd3ee9c7 (diff) | |
Merge branch '2022-05-26-assorted-fixes'
- Fixes for pytest timeout in CI, missing dependency on PCI for the
e1000 driver, fix for CVE-2022-30767 (NFS), TI K3 AM642 DTS bugfix,
MAINTAINERS updates, mksquashfs version check fix.
Diffstat (limited to 'test/py/u_boot_console_base.py')
| -rw-r--r-- | test/py/u_boot_console_base.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 58ec859b34f..26b6de07f88 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -400,6 +400,10 @@ class ConsoleBase(object): """ if self.p: + # Reset the console timeout value as some tests may change + # its default value during the execution + if not self.config.gdbserver: + self.p.timeout = 30000 return try: self.log.start_section('Starting U-Boot') |