From: Simon Glass Date: Sat, 4 Apr 2026 14:03:07 +0000 (-0600) Subject: test: Fix broken fs_obj_fat fixture X-Git-Tag: v2026.07-rc1~33^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e072d3aa24d09b8160af4596b82023ae94739c1d;p=thirdparty%2Fu-boot.git test: Fix broken fs_obj_fat fixture 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 --- diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 0205048e73a..cc5c0fc3756 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -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