]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
test: Fix broken fs_obj_fat fixture
authorSimon Glass <sjg@chromium.org>
Sat, 4 Apr 2026 14:03:07 +0000 (08:03 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 21 Apr 2026 21:30:38 +0000 (15:30 -0600)
The removal of the size_gran parameter from mk_fs() leaves a stale
positional argument (1024) that is now interpreted as the fs_img
filename. Since 1024 is an integer, os.path.join() raises TypeError,
causing the fixture to silently skip via the bare except clause.

Drop the stale argument so the fixture works again.

Fixes: d030dc34d67a ("test: fs_helper: Drop the size_gran argument")
Signed-off-by: Simon Glass <sjg@chromium.org>
test/py/tests/test_fs/conftest.py

index 0205048e73abe2cf3dccc10de4f6cfda2a019afc..cc5c0fc37566a0e92fb730540e5f9c07a395b9a6 100644 (file)
@@ -706,7 +706,7 @@ def fs_obj_fat(request, u_boot_config):
 
     try:
         # the volume size depends on the filesystem
-        fs_img = fs_helper.mk_fs(u_boot_config, fs_type, fs_size, f'{fs_size}', None, 1024)
+        fs_img = fs_helper.mk_fs(u_boot_config, fs_type, fs_size, f'{fs_size}')
     except:
         pytest.skip('Setup failed for filesystem: ' + fs_type)
         return