diff options
| author | Tom Rini <trini@konsulko.com> | 2025-06-16 09:39:31 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-16 09:39:31 -0600 |
| commit | 4d23c8aeaaaab1865732b11c7345bf5e2b9bb89a (patch) | |
| tree | 1f75e3727ae6806ccc996027e56d11c3eb7d2932 /test/py | |
| parent | 9de873b4c3098c0662d4adaeb1cc31be4e6d2688 (diff) | |
| parent | e6eca9ea6457e79acb4e2a426f1e078842c17b25 (diff) | |
Merge tag 'u-boot-dfu-next-20250616' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next
u-boot-dfu-next-20250616
CI: https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/26704
Usb gadget:
- Fix ti_musb driver in gadget mode (with DM_USB_GADGET)
DFU:
- mmc/scsi backends when using 10 or more partitions
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py index 6c3ac67979a..8ce680a92a0 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -514,8 +514,8 @@ def ubman(request): handle_exception(ubconfig, ubman_fix, log, err, 'Lab timeout', True) except BootFail as err: handle_exception(ubconfig, ubman_fix, log, err, 'Boot fail', True, - ubman.get_spawn_output()) - except Unexpected: + ubman_fix.get_spawn_output()) + except Unexpected as err: handle_exception(ubconfig, ubman_fix, log, err, 'Unexpected test output', False) return ubman_fix |