u-boot.git/test/py/tests/fs_helper.py, branch next

test: fs_helper: Skip empty srcdir when creating a filesystem

2026-04-21T21:30:38+00:00

FsHelper.mk_fs() always creates a srcdir via setup(), then passes it
to the module-level mk_fs(). This fails for filesystem types like ext2
that do not support the -d flag, raising ValueError even when no files
need to be copied.

Pass None for src_dir when the srcdir is empty, so that creating an
empty filesystem works for all supported types.

Signed-off-by: Simon Glass

test: Add a helper class to create disk images

2026-04-21T21:30:38+00:00

Provide a way to create disk images which consist of multiple filesystem
images.

Include a cur_dir option to place the disk image in the current
directory rather than in the persistent-data directory. This matches the
behaviour of setup_image() which places disk images in source_dir where
sandbox expects to find them. This flag is a temporary feature and
should be removed once all tests are migrated to use the persistent-data
directory instead.

Signed-off-by: Simon Glass

test: Convert fs_helper to use a class

2026-03-23T15:18:30+00:00

Create a class around mk_fs() (and later setup_image()) to handle the
common tasks of image creation. Many callers of fs_helper.mk_fs()
create their own scratch directories while users of
fs_helper.setup_image() rely on one being returned. Unify this by
adding 'srcdir' as a field while converting to a class.

The class delegates to the existing mk_fs() function for the actual
filesystem creation, adding lifecycle management for scratch
directories and the image file.

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

test: fs_helper: Drop the size_gran argument

2026-03-23T15:18:30+00:00

Nothing uses this argument, so make it a constant for now.

Signed-off-by: Simon Glass 
Reviewed-by: Christian Taedcke

test: Update comment for fs_helper.setup_image()

2026-03-23T15:18:30+00:00

This function actually allows creating two partitions now, so update its
comment to match that.

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

test: fs_helper: Add a quiet flag to mk_fs()

2026-03-23T15:18:29+00:00

In many cases callers only want to see warnings and errors from the
filesystem-creation tools, not their normal output.

Add a quiet parameter to mk_fs() that suppresses the output of mkfs
and switches mcopy from verbose to quiet mode.

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

test: fs_helper: Allow passing the image filename

2026-03-23T15:18:29+00:00

The mk_fs() function always generates its own image filename from the
prefix and fs_type. Some callers need to specify a custom leaf name
while still keeping the image under the persistent-data directory.

Add an fs_img parameter that accepts a leaf filename. When provided,
it is joined with persistent_data_dir instead of the default name.

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

Merge patch series "Improve pytest runtime"

2025-04-08T19:54:50+00:00

Tom Rini  says:

One thing that Simon Glass has noted is that our pytest run time keeps
getting longer. Looking at:
https://source.denx.de/u-boot/u-boot/-/pipelines/25011/test_report?job_name=sandbox%20test.py%3A%20%5Bfast%20amd64%5D
we can see that some of the longest running tests are a little puzzling.
It turns out that we have two ways of making filesystem images without
requiring root access and one of them is significantly slower than the
other. This series changes us from using virt-make-fs to only using the
mk_fs helper that currently resides in test_ut.py which uses standard
userspace tools. The final result can be seen at:
https://source.denx.de/u-boot/u-boot/-/pipelines/25015/test_report?job_name=sandbox%20test.py%3A%20%5Bfast%20amd64%5D
and the tests changed here now run much quicker.

Link: https://lore.kernel.org/r/20250320140030.2052434-1-trini@konsulko.com

test/py: Fix a problem with setup_image

2025-04-08T19:51:09+00:00

While we can be passed an image size to use, we always called qemu-img
with 20M as the size. Fix this by using the size parameter.

Signed-off-by: Tom Rini

test/py/tests: Move "setup_image" from test_ut.py to fs_helper.py

2025-04-08T19:51:09+00:00

The generic function in test_ut.py to create a disk image with partition
table can be useful outside of test_ut.py so move it to be available
more clearly.

To make this a bit more easily used library function, make use of
check_call directly rather than calling things though u_boot_utils. In
turn, to more easily handle stdin here, use the shell "printf" utility
to pass sfdisk the specification to create as we do not have an actual
file descriptor to use here.

Signed-off-by: Tom Rini